Enable possibility to use capabilities in images jobs

Make additional architectures field deprecated and prefer capabilities over additional arches in prowgen

Signed-off-by: Jakub Guzik <[email protected]>

Author: jmguzik

pkg/api/types.go

@@ -2584,6 +2584,10 @@ type ProjectDirectoryImageBuildStepConfiguration struct {
 	// Ref is an optional string linking to the extra_ref in "org.repo" format that this belongs to
 	Ref string `json:"ref,omitempty"`
 
+	// Capabilities is the list of strings that
+	// define additional capabilities needed by the test runs
+	Capabilities []string `json:"capabilities,omitempty"`
+
 	// isBundleImage indicates that this build step is a bundle image
 	isBundleImage bool
 }

pkg/prowgen/prowgen.go

@@ -129,14 +129,14 @@ func GenerateJobs(configSpec *cioperatorapi.ReleaseBuildConfiguration, info *Pro
 		}
 		imagesTestName := "images"
 		jobBaseGen := newJobBaseBuilder().TestName(imagesTestName)
-		injectArchitectureLabels(jobBaseGen, configSpec.Images)
+		injectCapabilitiesForImgJobs(jobBaseGen, configSpec.Images)
 
 		jobBaseGen.PodSpec.Add(Targets(presubmitTargets...))
 		presubmits[orgrepo] = append(presubmits[orgrepo], *generatePresubmitForTest(jobBaseGen, imagesTestName, info))
 
 		if configSpec.PromotionConfiguration != nil {
 			jobBaseGen = newJobBaseBuilder().TestName(imagesTestName)
-			injectArchitectureLabels(jobBaseGen, configSpec.Images)
+			injectCapabilitiesForImgJobs(jobBaseGen, configSpec.Images)
 
 			jobBaseGen.PodSpec.Add(Promotion(), Targets(imageTargets.UnsortedList()...))
 			if slackReporter := info.Config.GetSlackReporterConfigForTest(imagesTestName, configSpec.Metadata.Variant); slackReporter != nil {
@@ -398,10 +398,22 @@ func injectCapabilities(labels map[string]string, capabilities []string) {
 	}
 }
 
-func injectArchitectureLabels(g *prowJobBaseBuilder, imagesConfig []cioperatorapi.ProjectDirectoryImageBuildStepConfiguration) {
-	for _, imageConfig := range imagesConfig {
-		for _, arch := range imageConfig.AdditionalArchitectures {
-			g.WithLabel(fmt.Sprintf("capability/%s", arch), arch)
+// injectCapabilitiesForImgJobs injects capabilities for image build jobs
+// If the image build job has capabilities, it will use them and skip architecture labels
+// If the image build job does not have capabilities, it will use architecture labels
+func injectCapabilitiesForImgJobs(g *prowJobBaseBuilder, imagesConfig []cioperatorapi.ProjectDirectoryImageBuildStepConfiguration) {
+	var labels []string
+	for _, img := range imagesConfig {
+		labels = append(labels, img.Capabilities...)
+	}
+
+	if len(labels) == 0 {
+		for _, img := range imagesConfig {
+			labels = append(labels, img.AdditionalArchitectures...)
 		}
 	}
+
+	for _, lbl := range labels {
+		g.WithLabel(fmt.Sprintf("capability/%s", lbl), lbl)
+	}
 }

pkg/prowgen/prowgen_test.go

@@ -678,6 +678,52 @@ func TestGenerateJobs(t *testing.T) {
 				},
 			},
 		},
+		{
+			id: "multiarch postsubmit images, using capabilities",
+			config: &ciop.ReleaseBuildConfiguration{
+				Images: []ciop.ProjectDirectoryImageBuildStepConfiguration{
+					{
+						From:         "os",
+						To:           "ci-tools",
+						Capabilities: []string{"arm64"},
+					},
+					{
+						From:         "os",
+						To:           "test",
+						Capabilities: []string{"arm64", "ppc64-le"},
+					},
+				},
+				PromotionConfiguration: &ciop.PromotionConfiguration{},
+			},
+			repoInfo: &ProwgenInfo{
+				Metadata: ciop.Metadata{
+					Org:    "organization",
+					Repo:   "repository",
+					Branch: "branch",
+				},
+			},
+		},
+		{
+			id: "prefer capabilities over architecture labels",
+			config: &ciop.ReleaseBuildConfiguration{
+				Images: []ciop.ProjectDirectoryImageBuildStepConfiguration{
+					{
+						From:                    "os",
+						To:                      "ci-tools",
+						Capabilities:            []string{"arm64"},
+						AdditionalArchitectures: []string{"ppc64-le"},
+					},
+				},
+				PromotionConfiguration: &ciop.PromotionConfiguration{},
+			},
+			repoInfo: &ProwgenInfo{
+				Metadata: ciop.Metadata{
+					Org:    "organization",
+					Repo:   "repository",
+					Branch: "branch",
+				},
+			},
+		},
 		{
 			id: "multiarch test job",
 			config: &ciop.ReleaseBuildConfiguration{

pkg/prowgen/testdata/zz_fixture_TestGenerateJobs_multiarch_postsubmit_images__using_capabilities.yaml

@@ -0,0 +1,17 @@
+postsubmits:
+  organization/repository:
+  - always_run: true
+    labels:
+      capability/arm64: arm64
+      capability/ppc64-le: ppc64-le
+      ci-operator.openshift.io/is-promotion: "true"
+    max_concurrency: 1
+    name: branch-ci-organization-repository-branch-images
+presubmits:
+  organization/repository:
+  - always_run: false
+    labels:
+      capability/arm64: arm64
+      capability/ppc64-le: ppc64-le
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-organization-repository-branch-images

pkg/prowgen/testdata/zz_fixture_TestGenerateJobs_prefer_capabilities_over_architecture_labels.yaml

@@ -0,0 +1,15 @@
+postsubmits:
+  organization/repository:
+  - always_run: true
+    labels:
+      capability/arm64: arm64
+      ci-operator.openshift.io/is-promotion: "true"
+    max_concurrency: 1
+    name: branch-ci-organization-repository-branch-images
+presubmits:
+  organization/repository:
+  - always_run: false
+    labels:
+      capability/arm64: arm64
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-organization-repository-branch-images

pkg/webreg/zz_generated.ci_operator_reference.go

@@ -190,6 +190,10 @@ const ciOperatorReferenceYaml = "# The list of base images describe\n" +
 	"          name: ' '\n" +
 	"          # Value of the build arg.\n" +
 	"          value: ' '\n" +
+	"      # Capabilities is the list of strings that\n" +
+	"      # define additional capabilities needed by the test runs\n" +
+	"      capabilities:\n" +
+	"        - \"\"\n" +
 	"      # ContextDir is the directory in the project\n" +
 	"      # from which this build should be run.\n" +
 	"      context_dir: ' '\n" +
@@ -428,6 +432,10 @@ const ciOperatorReferenceYaml = "# The list of base images describe\n" +
 	"              name: ' '\n" +
 	"              # Value of the build arg.\n" +
 	"              value: ' '\n" +
+	"        # Capabilities is the list of strings that\n" +
+	"        # define additional capabilities needed by the test runs\n" +
+	"        capabilities:\n" +
+	"            - \"\"\n" +
 	"        # ContextDir is the directory in the project\n" +
 	"        # from which this build should be run.\n" +
 	"        context_dir: ' '\n" +