From 40a3b8982c0d8b50687ab0ee25540d86b2fbcd1a Mon Sep 17 00:00:00 2001 From: Iury Gregory Melo Ferreira Date: Wed, 20 May 2026 21:13:52 -0300 Subject: [PATCH] METAL-1837: upgrade pre-submit for CBO OOC This commit adds two new upgrade pre-submit jobs to CBO They will test the case where the initial cluster is installed with the code from PRs. Assisted-By: Claude 4.6 Opus High Signed-off-by: Iury Gregory Melo Ferreira --- ...shift-cluster-baremetal-operator-main.yaml | 26 +++ ...er-baremetal-operator-main-presubmits.yaml | 172 ++++++++++++++++++ 2 files changed, 198 insertions(+) diff --git a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-main.yaml b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-main.yaml index a860cac212b01..dd37f8174f91c 100644 --- a/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-main.yaml +++ b/ci-operator/config/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-main.yaml @@ -91,6 +91,19 @@ tests: env: RUN_UPGRADE_TEST: "true" workflow: baremetalds-e2e-upgrade-ovn-ipv4 +- always_run: false + as: e2e-metal-ipi-upgrade-out-of-change + capabilities: + - intranet + optional: true + steps: + cluster_profile: equinix-ocp-metal + dependencies: + OPENSHIFT_INSTALL_RELEASE_IMAGE: release:latest + OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial + env: + RUN_UPGRADE_TEST: "true" + workflow: baremetalds-e2e-upgrade-ovn-ipv4 - always_run: false as: e2e-metal-ipi-upgrade-ovn-ipv6 capabilities: @@ -101,6 +114,19 @@ tests: env: TEST_TYPE: upgrade workflow: baremetalds-e2e-upgrade-ovn-ipv6 +- always_run: false + as: e2e-metal-ipi-upgrade-ovn-ipv6-out-of-change + capabilities: + - intranet + optional: true + steps: + cluster_profile: equinix-ocp-metal + dependencies: + OPENSHIFT_INSTALL_RELEASE_IMAGE: release:latest + OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial + env: + TEST_TYPE: upgrade + workflow: baremetalds-e2e-upgrade-ovn-ipv6 - as: e2e-metal-ipi-ovn-ipv6 capabilities: - intranet diff --git a/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-main-presubmits.yaml b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-main-presubmits.yaml index 5147d7d5b8af8..96da0428fd81b 100644 --- a/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/cluster-baremetal-operator/openshift-cluster-baremetal-operator-main-presubmits.yaml @@ -771,6 +771,92 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-metal-ipi-upgrade,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^main$ + - ^main- + cluster: build05 + context: ci/prow/e2e-metal-ipi-upgrade-out-of-change + decorate: true + decoration_config: + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile + labels: + capability/intranet: intranet + ci-operator.openshift.io/cloud: equinix-ocp-metal + ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-baremetal-operator-main-e2e-metal-ipi-upgrade-out-of-change + optional: true + rerun_command: /test e2e-metal-ipi-upgrade-out-of-change + 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=e2e-metal-ipi-upgrade-out-of-change + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + 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 + trigger: (?m)^/test( | .* )e2e-metal-ipi-upgrade-out-of-change,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -857,6 +943,92 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-metal-ipi-upgrade-ovn-ipv6,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^main$ + - ^main- + cluster: build05 + context: ci/prow/e2e-metal-ipi-upgrade-ovn-ipv6-out-of-change + decorate: true + decoration_config: + sparse_checkout_files: + - .ci-operator.yaml + - Dockerfile + labels: + capability/intranet: intranet + ci-operator.openshift.io/cloud: equinix-ocp-metal + ci-operator.openshift.io/cloud-cluster-profile: equinix-ocp-metal + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-cluster-baremetal-operator-main-e2e-metal-ipi-upgrade-ovn-ipv6-out-of-change + optional: true + rerun_command: /test e2e-metal-ipi-upgrade-ovn-ipv6-out-of-change + 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=e2e-metal-ipi-upgrade-ovn-ipv6-out-of-change + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + 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 + trigger: (?m)^/test( | .* )e2e-metal-ipi-upgrade-ovn-ipv6-out-of-change,?($|\s.*) - agent: kubernetes always_run: false branches: