Merge pull request #5009 from Prucek/run-if-changed

feat(prowgen): propagate run_if_changed/skip_if_only_changed for images jobs

Author: openshift-merge-bot[bot]

cmd/ci-operator-config-mirror/main.go

@@ -261,7 +261,7 @@ func ciOperatorConfigsCallback(o options, configsByRepo configsByRepo) func(rbc
 		repoInfo.Org = o.toOrg
 		rbc.Metadata.Org = o.toOrg
 
-		if len(rbc.Tests) > 0 || len(rbc.Images) > 0 {
+		if len(rbc.Tests) > 0 || len(rbc.Images.Items) > 0 {
 			configsByRepo[repoInfo.Repo] = append(configsByRepo[repoInfo.Repo], config.DataWithInfo{
 				Configuration: *rbc,
 				Info:          *repoInfo,

cmd/ci-operator-prowgen/main_test.go

@@ -38,8 +38,9 @@ build_root:
     namespace: openshift
     tag: golang-1.10
 images:
-- from: base
-  to: service-serving-cert-signer
+  items:
+  - from: base
+    to: service-serving-cert-signer
 resources:
   '*':
     limits:
@@ -77,8 +78,9 @@ build_root:
     namespace: openshift
     tag: golang-1.10
 images:
-- from: base
-  to: service-serving-cert-signer
+  items:
+  - from: base
+    to: service-serving-cert-signer
 resources:
   '*':
     limits:
@@ -133,8 +135,9 @@ tests:
     namespace: openshift
     tag: base
 images:
-- from: base
-  to: service-serving-cert-signer
+  items:
+  - from: base
+    to: service-serving-cert-signer
 resources:
   '*':
     limits:
@@ -193,8 +196,9 @@ tests:
     namespace: openshift
     tag: base
 images:
-- from: base
-  to: service-serving-cert-signer
+  items:
+  - from: base
+    to: service-serving-cert-signer
 resources:
   '*':
     limits:

cmd/ci-operator/main.go

@@ -1179,7 +1179,7 @@ func (o *options) Run() (errs []error) {
 // determineSkippedImages determines which images can be skipped when
 // build_images_if_affected is enabled and the [images] target is requested.
 func determineSkippedImages(config *api.ReleaseBuildConfiguration, jobSpec *api.JobSpec, targets []string) sets.Set[string] {
-	if config == nil || jobSpec == nil || !config.BuildImagesIfAffected {
+	if config == nil || jobSpec == nil || !config.Images.BuildIfAffected {
 		return nil
 	}
 
@@ -1195,7 +1195,7 @@ func determineSkippedImages(config *api.ReleaseBuildConfiguration, jobSpec *api.
 	}
 
 	skipped := sets.New[string]()
-	for _, img := range config.Images {
+	for _, img := range config.Images.Items {
 		if !affectedTools.Has(string(img.To)) {
 			skipped.Insert(string(img.To))
 		}

cmd/ci-operator/main_test.go

@@ -448,66 +448,67 @@ base_images:
 binary_build_commands: make build WHAT='cmd/hypershift vendor/k8s.io/kubernetes/cmd/hyperkube'
 canonical_go_repository: github.com/openshift/origin
 images:
-- dockerfile_path: images/template-service-broker/Dockerfile.rhel
-  from: base
-  to: template-service-broker
-  inputs:
-    bin:
-      as:
-      - builder
-- dockerfile_path: images/cli/Dockerfile.rhel
-  from: base
-  to: cli
-  inputs:
-    bin:
-      as:
-      - builder
-- dockerfile_path: images/hypershift/Dockerfile.rhel
-  from: base
-  to: hypershift
-  inputs:
-    bin:
-      as:
-      - builder
-- dockerfile_path: images/hyperkube/Dockerfile.rhel
-  from: base
-  to: hyperkube
-  inputs:
-    bin:
-      as:
-      - builder
-- dockerfile_path: images/tests/Dockerfile.rhel
-  from: cli
-  to: tests
-  inputs:
-    bin:
-      as:
-      - builder
-- context_dir: images/deployer/
-  dockerfile_path: Dockerfile.rhel
-  from: cli
-  to: deployer
-- context_dir: images/recycler/
-  dockerfile_path: Dockerfile.rhel
-  from: cli
-  to: recycler
-- dockerfile_path: images/sdn/Dockerfile.rhel
-  from: base
-  to: node # TODO: SDN
-  inputs:
-    bin:
-      as:
-      - builder
-- context_dir: images/os/
-  from: base
-  inputs:
-    base-machine-with-rpms:
-      as:
-      - builder
-    machine-os-content-base:
-      as:
-      -  registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
-  to: machine-os-content
+  items:
+  - dockerfile_path: images/template-service-broker/Dockerfile.rhel
+    from: base
+    to: template-service-broker
+    inputs:
+      bin:
+        as:
+        - builder
+  - dockerfile_path: images/cli/Dockerfile.rhel
+    from: base
+    to: cli
+    inputs:
+      bin:
+        as:
+        - builder
+  - dockerfile_path: images/hypershift/Dockerfile.rhel
+    from: base
+    to: hypershift
+    inputs:
+      bin:
+        as:
+        - builder
+  - dockerfile_path: images/hyperkube/Dockerfile.rhel
+    from: base
+    to: hyperkube
+    inputs:
+      bin:
+        as:
+        - builder
+  - dockerfile_path: images/tests/Dockerfile.rhel
+    from: cli
+    to: tests
+    inputs:
+      bin:
+        as:
+        - builder
+  - context_dir: images/deployer/
+    dockerfile_path: Dockerfile.rhel
+    from: cli
+    to: deployer
+  - context_dir: images/recycler/
+    dockerfile_path: Dockerfile.rhel
+    from: cli
+    to: recycler
+  - dockerfile_path: images/sdn/Dockerfile.rhel
+    from: base
+    to: node # TODO: SDN
+    inputs:
+      bin:
+        as:
+        - builder
+  - context_dir: images/os/
+    from: base
+    inputs:
+      base-machine-with-rpms:
+        as:
+        - builder
+      machine-os-content-base:
+        as:
+        -  registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
+    to: machine-os-content
 raw_steps:
 - pipeline_image_cache_step:
     commands: mkdir -p _output/local/releases; touch _output/local/releases/CHECKSUM;
@@ -661,7 +662,7 @@ var parsedConfig = &api.ReleaseBuildConfiguration{
 	RpmBuildCommands:        "make build-rpms",
 	RpmBuildLocation:        "",
 	CanonicalGoRepository:   pointer.StringPtr("github.com/openshift/origin"),
-	Images: []api.ProjectDirectoryImageBuildStepConfiguration{{
+	Images: api.ImageConfiguration{Items: []api.ProjectDirectoryImageBuildStepConfiguration{{
 		From: "base",
 		To:   "template-service-broker",
 		ProjectDirectoryImageBuildInputs: api.ProjectDirectoryImageBuildInputs{
@@ -727,7 +728,7 @@ var parsedConfig = &api.ReleaseBuildConfiguration{
 				"machine-os-content-base": {As: []string{"registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content"}},
 			},
 		},
-	}},
+	}}},
 	RawSteps: []api.StepConfiguration{{
 		PipelineImageCacheStepConfiguration: &api.PipelineImageCacheStepConfiguration{
 			From:     "bin",

cmd/private-org-peribolos-sync/testdata/ci-operator/config/org1/repo1/org1-repo1-main.yaml

@@ -4,9 +4,10 @@ build_root:
     namespace: openshift
     tag: golang-1.21
 images:
-- dockerfile_path: Dockerfile
-  from: base
-  to: test-image
+  items:
+  - dockerfile_path: Dockerfile
+    from: base
+    to: test-image
 promotion:
   to:
   - name: "4.17"

cmd/private-org-peribolos-sync/testdata/ci-operator/config/org1/repo2/org1-repo2-main.yaml

@@ -4,9 +4,10 @@ build_root:
     namespace: openshift
     tag: golang-1.21
 images:
-- dockerfile_path: Dockerfile
-  from: base
-  to: non-official-image
+  items:
+  - dockerfile_path: Dockerfile
+    from: base
+    to: non-official-image
 promotion:
   to:
   - name: "latest"

cmd/private-org-peribolos-sync/testdata/ci-operator/config/org2/repo3/org2-repo3-main.yaml

@@ -4,9 +4,10 @@ build_root:
     namespace: openshift
     tag: golang-1.21
 images:
-- dockerfile_path: Dockerfile
-  from: base
-  to: whitelisted-image
+  items:
+  - dockerfile_path: Dockerfile
+    from: base
+    to: whitelisted-image
 promotion:
   to:
   - name: "latest"

cmd/registry-replacer/main.go

@@ -258,7 +258,7 @@ func replacer(
 			return nil
 		}
 
-		if len(config.Images) == 0 {
+		if len(config.Images.Items) == 0 {
 			return nil
 		}
 
@@ -286,7 +286,7 @@ func replacer(
 			// that we do not have the appropriate permissions.
 			var hasNonEmptyDockerfile bool
 
-			for idx, image := range config.Images {
+			for idx, image := range config.Images.Items {
 				var dockerfile []byte
 				if image.DockerfileLiteral != nil {
 					dockerfile = []byte(*image.DockerfileLiteral)
@@ -310,7 +310,7 @@ func replacer(
 					return fmt.Errorf("failed to apply replacements to Dockerfile in %s/%s@%s: %w", info.Org, info.Repo, info.Branch, err)
 				}
 
-				foundTags, err := ensureReplacement(&config.Images[idx], dockerfile)
+				foundTags, err := ensureReplacement(&config.Images.Items[idx], dockerfile)
 				if err != nil {
 					return fmt.Errorf("failed to ensure replacements in %s/%s@%s: %w", info.Org, info.Repo, info.Branch, err)
 				}
@@ -598,7 +598,7 @@ func pruneReplacements(config *api.ReleaseBuildConfiguration, filter asDirective
 	var prunedImages []api.ProjectDirectoryImageBuildStepConfiguration
 	var errs []error
 
-	for _, image := range config.Images {
+	for _, image := range config.Images.Items {
 		for k, sourceImage := range image.Inputs {
 			var newAs []string
 			for _, sourceImage := range sourceImage.As {
@@ -624,7 +624,7 @@ func pruneReplacements(config *api.ReleaseBuildConfiguration, filter asDirective
 		}
 	}
 
-	config.Images = prunedImages
+	config.Images.Items = prunedImages
 
 	return utilerrors.NewAggregate(errs)
 }
@@ -667,7 +667,7 @@ func pruneUnusedBaseImages(config *api.ReleaseBuildConfiguration, resolvedConfig
 		getTestStepImages(resolvedConfig, &usedBaseImages, &test)
 	}
 
-	for _, image := range resolvedConfig.Images {
+	for _, image := range resolvedConfig.Images.Items {
 		usedBaseImages.Insert(string(image.From))
 		for input := range image.Inputs {
 			usedBaseImages.Insert(input)
@@ -818,7 +818,7 @@ func updateDockerfilesToMatchOCPBuildData(
 		return
 	}
 
-	for idx, image := range config.Images {
+	for idx, image := range config.Images.Items {
 		promotionTarget, ok := promotedTags[string(image.To)]
 		if !ok {
 			continue
@@ -830,10 +830,10 @@ func updateDockerfilesToMatchOCPBuildData(
 			continue
 		}
 		if image.ContextDir != dockerfilePath.contextDir {
-			config.Images[idx].ContextDir = dockerfilePath.contextDir
+			config.Images.Items[idx].ContextDir = dockerfilePath.contextDir
 		}
 		if image.DockerfilePath != dockerfilePath.dockerfile {
-			config.Images[idx].DockerfilePath = dockerfilePath.dockerfile
+			config.Images.Items[idx].DockerfilePath = dockerfilePath.dockerfile
 		}
 	}
 }