Merge pull request #22486 from chaodaiG/crier-always-upload

skip_report flag in prowjob only used by crier reporters that report back to CI system
kubernetes · Jun 9, 2021 · 2eb997a · 2eb997a
2 parents 7b3bb72 + 1bc0635
commit 2eb997a
Show file tree

Hide file tree

Showing 4 changed files with 142 additions and 52 deletions.
diff --git a/prow/crier/controller.go b/prow/crier/controller.go
@@ -178,7 +178,7 @@ func (r *reconciler) reconcile(ctx context.Context, log *logrus.Entry, req recon
 
 	log = log.WithField("jobName", pj.Spec.Job)
 
-	if !pj.Spec.Report || !r.reporter.ShouldReport(ctx, log, &pj) {
+	if !r.reporter.ShouldReport(ctx, log, &pj) {
 		return nil, nil
 	}
 

diff --git a/prow/crier/reporters/gerrit/reporter.go b/prow/crier/reporters/gerrit/reporter.go
@@ -111,6 +111,10 @@ func (c *Client) GetName() string {
 
 // ShouldReport returns if this prowjob should be reported by the gerrit reporter
 func (c *Client) ShouldReport(ctx context.Context, log *logrus.Entry, pj *v1.ProwJob) bool {
+	if !pj.Spec.Report {
+		return false
+	}
+
 	ctx, cancel := context.WithTimeout(ctx, 10*time.Second)
 	defer cancel()