Respecting always_run from config file

Author: Hector Vido

cmd/ci-operator-prowgen/main.go

@@ -123,6 +123,9 @@ func (o *options) generateJobsToDir(subDir string, prowConfig map[string]*config
 func generateJobs(resolver registry.Resolver, cache map[string]*config.Prowgen, output map[string]*prowconfig.JobConfig) func(configSpec *cioperatorapi.ReleaseBuildConfiguration, info *config.Info) error {
 	return func(configSpec *cioperatorapi.ReleaseBuildConfiguration, info *config.Info) error {
 		orgRepo := fmt.Sprintf("%s/%s", info.Org, info.Repo)
+		if orgRepo == "rh-ecosystem-edge/recert" && info.Filename == "/home/hector/go/src/github.com/openshift/release/ci-operator/config/rh-ecosystem-edge/recert/rh-ecosystem-edge-recert-release-4.18.yaml" {
+			print(orgRepo)
+		}
 		pInfo := &prowgen.ProwgenInfo{Metadata: info.Metadata, Config: config.Prowgen{Private: false, Expose: false}}
 		var ok bool
 		var err error
@@ -195,8 +198,8 @@ func writeToDir(dir string, c map[string]*prowconfig.JobConfig) error {
 	errCh := make(chan error)
 	map_ := func() error {
 		for x := range ch {
-			i := strings.Index(x.k, "/")
-			org, repo := x.k[:i], x.k[i+1:]
+			i := strings.Split(x.k, "/")
+			org, repo := i[0], i[1]
 			if err := jc.WriteToDir(dir, org, repo, x.v, prowgen.Generator, nil); err != nil {
 				errCh <- err
 			}

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,7 +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

pkg/prowgen/prowgen.go

@@ -88,6 +88,9 @@ func GenerateJobs(configSpec *cioperatorapi.ReleaseBuildConfiguration, info *Pro
 			}
 		} else if element.Postsubmit {
 			postsubmit := generatePostsubmitForTest(g, info, func(options *generatePostsubmitOptions) {
+				if element.AlwaysRun != nil {
+					options.alwaysRun = element.AlwaysRun
+				}
 				options.runIfChanged = element.RunIfChanged
 				options.skipIfOnlyChanged = element.SkipIfOnlyChanged
 			})
@@ -180,13 +183,16 @@ func GenerateJobs(configSpec *cioperatorapi.ReleaseBuildConfiguration, info *Pro
 
 func handlePresubmit(g *prowJobBaseBuilder, element api.TestStepConfiguration, info *ProwgenInfo, disableRehearsal bool, requests api.ResourceList, presubmits map[string][]prowconfig.Presubmit, orgrepo string) {
 	presubmit := generatePresubmitForTest(g, element.As, info, func(options *generatePresubmitOptions) {
-		options.pipelineRunIfChanged = element.PipelineRunIfChanged
-		options.Capabilities = element.Capabilities
-		options.runIfChanged = element.RunIfChanged
-		options.skipIfOnlyChanged = element.SkipIfOnlyChanged
-		options.defaultDisable = element.AlwaysRun != nil && !*element.AlwaysRun
-		options.optional = element.Optional
-		options.disableRehearsal = disableRehearsal
+		if element.AlwaysRun != nil {
+			options.alwaysRun = element.AlwaysRun
+        	options.defaultDisable = !*element.AlwaysRun
+		}
+        options.Capabilities = element.Capabilities
+        options.disableRehearsal = disableRehearsal
+        options.optional = element.Optional
+        options.pipelineRunIfChanged = element.PipelineRunIfChanged
+        options.runIfChanged = element.RunIfChanged
+        options.skipIfOnlyChanged = element.SkipIfOnlyChanged
 	})
 	v, requestingKVM := requests[cioperatorapi.KVMDeviceLabel]
 	if requestingKVM {
@@ -205,6 +211,7 @@ func testContainsLease(test *cioperatorapi.TestStepConfiguration) bool {
 }
 
 type generatePresubmitOptions struct {
+	alwaysRun            *bool
 	pipelineRunIfChanged string
 	Capabilities         []string
 	runIfChanged         string
@@ -238,7 +245,6 @@ func generatePresubmitForTest(jobBaseBuilder *prowJobBaseBuilder, name string, i
 	}
 	pj := &prowconfig.Presubmit{
 		JobBase:   base,
-		AlwaysRun: opts.runIfChanged == "" && opts.skipIfOnlyChanged == "" && !opts.defaultDisable && opts.pipelineRunIfChanged == "",
 		Brancher:  prowconfig.Brancher{Branches: sets.List(sets.New[string](jc.ExactlyBranch(info.Branch), jc.FeatureBranch(info.Branch)))},
 		Reporter: prowconfig.Reporter{
 			Context: fmt.Sprintf("ci/prow/%s", shortName),
@@ -251,11 +257,17 @@ func generatePresubmitForTest(jobBaseBuilder *prowJobBaseBuilder, name string, i
 		},
 		Optional: opts.optional,
 	}
+	if opts.alwaysRun != nil {
+		pj.AlwaysRun = *opts.alwaysRun
+	} else {
+		pj.AlwaysRun = opts.runIfChanged == "" && opts.skipIfOnlyChanged == "" && !opts.defaultDisable && opts.pipelineRunIfChanged == ""
+	}
 	injectCapabilities(pj.Labels, opts.Capabilities)
 	return pj
 }
 
 type generatePostsubmitOptions struct {
+	alwaysRun         *bool
 	runIfChanged      string
 	Capabilities      []string
 	skipIfOnlyChanged string