Respecting always_run from config file

Author: Hector Vido

pkg/jobconfig/files.go

@@ -365,7 +365,7 @@ func WriteToDir(jobDir, org, repo string, jobConfig *prowconfig.JobConfig, gener
 	return nil
 }
 
-// Given two JobConfig, merge jobs from the `source` one to to `destination`
+// Given two JobConfig, merge jobs from the `source` one to `destination`
 // one. Jobs are matched by name. All jobs from `source` will be present in
 // `destination` - if there were jobs with the same name in `destination`, they
 // will be updated. All jobs in `destination` that are not overwritten this
@@ -471,9 +471,6 @@ func mergeJobConfig(destination, source *prowconfig.JobConfig, allJobs sets.Set[
 func mergePresubmits(old, new *prowconfig.Presubmit) prowconfig.Presubmit {
 	merged := *new
 
-	merged.AlwaysRun = old.AlwaysRun
-	merged.RunIfChanged = old.RunIfChanged
-	merged.SkipIfOnlyChanged = old.SkipIfOnlyChanged
 	merged.MaxConcurrency = old.MaxConcurrency
 	merged.SkipReport = old.SkipReport
 	merged.Cluster = func() string {
@@ -485,19 +482,14 @@ func mergePresubmits(old, new *prowconfig.Presubmit) prowconfig.Presubmit {
 		return ""
 	}()
 
-	if new.RunIfChanged != "" || new.SkipIfOnlyChanged != "" || new.Annotations["pipeline_run_if_changed"] != "" {
-		merged.RunIfChanged = new.RunIfChanged
-		merged.SkipIfOnlyChanged = new.SkipIfOnlyChanged
-		merged.AlwaysRun = new.AlwaysRun
-	}
-
 	// TODO(muller): Special case images jobs for now. Some repos are marking
 	// images jobs as optional for which we do not have syntax in ci-operator (should we?).
 	// Tolerate manual changes for these jobs for now
 	if strings.HasSuffix(merged.Name, "-images") {
-		merged.Optional = old.Optional
-		if new.Optional {
-			merged.Optional = new.Optional
+		if old.RunIfChanged != "" || old.SkipIfOnlyChanged != "" {
+			merged.RunIfChanged = old.RunIfChanged
+			merged.SkipIfOnlyChanged = old.SkipIfOnlyChanged
+			merged.AlwaysRun = false
 		}
 	}
 

pkg/prowgen/prowgen.go

@@ -131,8 +131,18 @@ func GenerateJobs(configSpec *cioperatorapi.ReleaseBuildConfiguration, info *Pro
 		jobBaseGen := newJobBaseBuilder().TestName(imagesTestName)
 		injectArchitectureLabels(jobBaseGen, configSpec.Images)
 
+		optional := false
+		for _, image := range configSpec.Images {
+			if image.Optional {
+				optional = true
+				break
+			}
+		}
+
 		jobBaseGen.PodSpec.Add(Targets(presubmitTargets...))
-		presubmits[orgrepo] = append(presubmits[orgrepo], *generatePresubmitForTest(jobBaseGen, imagesTestName, info))
+		presubmits[orgrepo] = append(presubmits[orgrepo], *generatePresubmitForTest(jobBaseGen, imagesTestName, info, func(options *generatePresubmitOptions) {
+			options.optional = optional
+		}))
 
 		if configSpec.PromotionConfiguration != nil {
 			jobBaseGen = newJobBaseBuilder().TestName(imagesTestName)
@@ -246,7 +256,7 @@ type generatePresubmitOptions struct {
 }
 
 func (opts *generatePresubmitOptions) shouldAlwaysRun() bool {
-	return opts.runIfChanged == "" && opts.skipIfOnlyChanged == "" && !opts.defaultDisable && opts.pipelineRunIfChanged == ""
+	return opts.runIfChanged == "" && opts.skipIfOnlyChanged == "" && !opts.defaultDisable && opts.pipelineRunIfChanged == "" && !opts.optional
 }
 
 type generatePresubmitOption func(options *generatePresubmitOptions)

pkg/prowgen/testdata/zz_fixture_TestGeneratePresubmitForTest_optional_presubmit.yaml

@@ -1,5 +1,5 @@
 agent: kubernetes
-always_run: true
+always_run: false
 branches:
 - ^branch$
 - ^branch-

test/integration/ci-operator-prowgen/input/jobs/super/duper/super-duper-master-presubmits.yaml

@@ -1,17 +1,15 @@
 presubmits:
   super/duper:
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^master$
     - ^master-
     context: ci/prow/images
     decorate: true
     max_concurrency: 100
     name: pull-ci-super-duper-master-images
-    optional: true
     rerun_command: /test images
-    run_if_changed: changes
     skip_cloning: true
     skip_report: true
     spec:

test/integration/ci-operator-prowgen/output/jobs/super/duper/super-duper-master-presubmits.yaml

@@ -55,7 +55,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )ci-index,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-
@@ -180,7 +180,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )e2e,?($|\s.*)
   - agent: kubernetes
-    always_run: false
+    always_run: true
     branches:
     - ^master$
     - ^master-
@@ -193,9 +193,7 @@ presubmits:
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
     max_concurrency: 100
     name: pull-ci-super-duper-master-images
-    optional: true
     rerun_command: /test images
-    run_if_changed: changes
     skip_report: true
     spec:
       containers:
@@ -303,7 +301,7 @@ presubmits:
           secretName: result-aggregator
     trigger: (?m)^/test( | .* )lint,?($|\s.*)
   - agent: kubernetes
-    always_run: true
+    always_run: false
     branches:
     - ^master$
     - ^master-