MULTIARCH-5321 Adding x86 only multi-payload jobs

The multiarch team is tryign to increase signal for the multi payload by adding an x86 only AWS job.
openshift · Feb 6, 2025 · 1a0e02e · 1a0e02e
1 parent 4548253
commit 1a0e02e
Show file tree

Hide file tree

Showing 4 changed files with 197 additions and 0 deletions.
diff --git a/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.19.yaml b/ci-operator/config/openshift/multiarch/openshift-multiarch-master__nightly-4.19.yaml
@@ -837,6 +837,23 @@ tests:
       OCP_ARCH: amd64
       TEST_SUITE: upgrade-conformance
     workflow: openshift-upgrade-azure-heterogeneous
+- as: ocp-e2e-aws-ovn-multi-x-x
+  interval: 72h
+  steps:
+    cluster_profile: aws-2
+    dependencies:
+      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-latest
+    workflow: openshift-e2e-aws
+- as: ocp-e2e-upgrade-aws-ovn-multi-x-x
+  interval: 72h
+  steps:
+    cluster_profile: aws-2
+    dependencies:
+      OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:multi-initial
+      OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:multi-latest
+    env:
+      BASE_DOMAIN: aws-2.ci.openshift.org
+    workflow: openshift-upgrade-aws
 - as: ocp-e2e-gcp-ovn-multi-a-a
   cron: 0 11 * * 0
   steps:

diff --git a/ci-operator/jobs/openshift/multiarch/openshift-multiarch-master-periodics.yaml b/ci-operator/jobs/openshift/multiarch/openshift-multiarch-master-periodics.yaml
@@ -32481,6 +32481,81 @@ periodics:
     - name: result-aggregator
       secret:
         secretName: result-aggregator
+- agent: kubernetes
+  cluster: build11
+  decorate: true
+  decoration_config:
+    skip_cloning: true
+  extra_refs:
+  - base_ref: master
+    org: openshift
+    repo: multiarch
+  interval: 72h
+  labels:
+    ci-operator.openshift.io/cloud: aws
+    ci-operator.openshift.io/cloud-cluster-profile: aws-2
+    ci-operator.openshift.io/variant: nightly-4.19
+    ci.openshift.io/generator: prowgen
+    job-release: "4.19"
+    pj-rehearse.openshift.io/can-be-rehearsed: "true"
+  name: periodic-ci-openshift-multiarch-master-nightly-4.19-ocp-e2e-aws-ovn-multi-x-x
+  spec:
+    containers:
+    - args:
+      - --gcs-upload-secret=/secrets/gcs/service-account.json
+      - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+      - --lease-server-credentials-file=/etc/boskos/credentials
+      - --report-credentials-file=/etc/report/credentials
+      - --secret-dir=/secrets/ci-pull-credentials
+      - --target=ocp-e2e-aws-ovn-multi-x-x
+      - --variant=nightly-4.19
+      command:
+      - ci-operator
+      image: ci-operator:latest
+      imagePullPolicy: Always
+      name: ""
+      resources:
+        requests:
+          cpu: 10m
+      volumeMounts:
+      - mountPath: /etc/boskos
+        name: boskos
+        readOnly: true
+      - mountPath: /secrets/ci-pull-credentials
+        name: ci-pull-credentials
+        readOnly: true
+      - mountPath: /secrets/gcs
+        name: gcs-credentials
+        readOnly: true
+      - mountPath: /secrets/manifest-tool
+        name: manifest-tool-local-pusher
+        readOnly: true
+      - mountPath: /etc/pull-secret
+        name: pull-secret
+        readOnly: true
+      - mountPath: /etc/report
+        name: result-aggregator
+        readOnly: true
+    serviceAccountName: ci-operator
+    volumes:
+    - name: boskos
+      secret:
+        items:
+        - key: credentials
+          path: credentials
+        secretName: boskos-credentials
+    - name: ci-pull-credentials
+      secret:
+        secretName: ci-pull-credentials
+    - name: manifest-tool-local-pusher
+      secret:
+        secretName: manifest-tool-local-pusher
+    - name: pull-secret
+      secret:
+        secretName: registry-pull-credentials
+    - name: result-aggregator
+      secret:
+        secretName: result-aggregator
 - agent: kubernetes
   cluster: build11
   decorate: true
@@ -34821,6 +34896,81 @@ periodics:
     - name: result-aggregator
       secret:
         secretName: result-aggregator
+- agent: kubernetes
+  cluster: build11
+  decorate: true
+  decoration_config:
+    skip_cloning: true
+  extra_refs:
+  - base_ref: master
+    org: openshift
+    repo: multiarch
+  interval: 72h
+  labels:
+    ci-operator.openshift.io/cloud: aws
+    ci-operator.openshift.io/cloud-cluster-profile: aws-2
+    ci-operator.openshift.io/variant: nightly-4.19
+    ci.openshift.io/generator: prowgen
+    job-release: "4.19"
+    pj-rehearse.openshift.io/can-be-rehearsed: "true"
+  name: periodic-ci-openshift-multiarch-master-nightly-4.19-ocp-e2e-upgrade-aws-ovn-multi-x-x
+  spec:
+    containers:
+    - args:
+      - --gcs-upload-secret=/secrets/gcs/service-account.json
+      - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
+      - --lease-server-credentials-file=/etc/boskos/credentials
+      - --report-credentials-file=/etc/report/credentials
+      - --secret-dir=/secrets/ci-pull-credentials
+      - --target=ocp-e2e-upgrade-aws-ovn-multi-x-x
+      - --variant=nightly-4.19
+      command:
+      - ci-operator
+      image: ci-operator:latest
+      imagePullPolicy: Always
+      name: ""
+      resources:
+        requests:
+          cpu: 10m
+      volumeMounts:
+      - mountPath: /etc/boskos
+        name: boskos
+        readOnly: true
+      - mountPath: /secrets/ci-pull-credentials
+        name: ci-pull-credentials
+        readOnly: true
+      - mountPath: /secrets/gcs
+        name: gcs-credentials
+        readOnly: true
+      - mountPath: /secrets/manifest-tool
+        name: manifest-tool-local-pusher
+        readOnly: true
+      - mountPath: /etc/pull-secret
+        name: pull-secret
+        readOnly: true
+      - mountPath: /etc/report
+        name: result-aggregator
+        readOnly: true
+    serviceAccountName: ci-operator
+    volumes:
+    - name: boskos
+      secret:
+        items:
+        - key: credentials
+          path: credentials
+        secretName: boskos-credentials
+    - name: ci-pull-credentials
+      secret:
+        secretName: ci-pull-credentials
+    - name: manifest-tool-local-pusher
+      secret:
+        secretName: manifest-tool-local-pusher
+    - name: pull-secret
+      secret:
+        secretName: registry-pull-credentials
+    - name: result-aggregator
+      secret:
+        secretName: result-aggregator
 - agent: kubernetes
   cluster: build01
   decorate: true

diff --git a/core-services/release-controller/_releases/priv/release-ocp-4.19-multi.json b/core-services/release-controller/_releases/priv/release-ocp-4.19-multi.json
@@ -39,6 +39,13 @@
                 "name": "periodic-ci-openshift-multiarch-master-nightly-4.19-ocp-e2e-aws-ovn-multi-x-ax-priv"
             }
         },
+        "e2e-aws-ovn-multi-x-x": {
+            "disabled": true,
+            "maxRetries": 2,
+            "prowJob": {
+                "name": "-priv"
+            }
+        },
         "e2e-aws-ovn-nightly-upgrade-multi-x-ax": {
             "disabled": true,
             "optional": true,
@@ -48,6 +55,15 @@
             "upgrade": true,
             "upgradeFrom": "Previous"
         },
+        "e2e-aws-ovn-nightly-upgrade-multi-x-x": {
+            "disabled": true,
+            "optional": true,
+            "prowJob": {
+                "name": "-priv"
+            },
+            "upgrade": true,
+            "upgradeFrom": "Previous"
+        },
         "e2e-aws-ovn-sno-multi-a-a": {
             "disabled": true,
             "optional": true,

diff --git a/core-services/release-controller/_releases/release-ocp-4.19-multi.json b/core-services/release-controller/_releases/release-ocp-4.19-multi.json
@@ -12,12 +12,26 @@
   "check": {},
   "publish": {},
   "verify": {
+    "e2e-aws-ovn-multi-x-x": {
+      "maxRetries": 2,
+      "prowJob": {
+        "name": ""
+      }
+    },
     "e2e-aws-ovn-multi-x-ax": {
       "maxRetries": 2,
       "prowJob": {
         "name": "periodic-ci-openshift-multiarch-master-nightly-4.19-ocp-e2e-aws-ovn-multi-x-ax"
       }
     },
+    "e2e-aws-ovn-nightly-upgrade-multi-x-x": {
+      "optional": true,
+      "prowJob": {
+        "name": ""
+      },
+      "upgrade": true,
+      "upgradeFrom": "Previous"
+    },
     "e2e-aws-ovn-nightly-upgrade-multi-x-ax": {
       "optional": true,
       "prowJob": {