From 410a181cb26ef4728d73f8ca7451f49557a61b57 Mon Sep 17 00:00:00 2001 From: Tiger Kaovilai Date: Tue, 11 Aug 2026 14:12:15 -0400 Subject: [PATCH] Prep oadp-1.4/1.5 with bundle promotion for future cross-repo e2e Same skip_building_index pattern as #83282 (oadp-dev/oadp-1.6): builds and promotes oadp-operator's bundle image directly, no index. These branches had no operator: stanza at all before this - the bundle wasn't built here, let alone promoted. Prep work for openshift/oadp-operator#1832's Group A1 (velero + velero-plugin-for-* + openshift-velero-plugin), which spans 1.3->1.6/dev and will need a promoted bundle + e2e-test binary on each branch to install oadp-operator cross-repo the same way kubevirt-datamover-controller/plugin now do. Signed-off-by: Tiger Kaovilai --- .../openshift-oadp-operator-oadp-1.4.yaml | 16 ++++- .../openshift-oadp-operator-oadp-1.5.yaml | 16 ++++- ...hift-oadp-operator-oadp-1.4-periodics.yaml | 2 + ...ft-oadp-operator-oadp-1.4-postsubmits.yaml | 4 ++ ...ift-oadp-operator-oadp-1.4-presubmits.yaml | 61 +++++++++++++++++++ ...hift-oadp-operator-oadp-1.5-periodics.yaml | 2 + ...ft-oadp-operator-oadp-1.5-postsubmits.yaml | 4 ++ ...ift-oadp-operator-oadp-1.5-presubmits.yaml | 61 +++++++++++++++++++ 8 files changed, 164 insertions(+), 2 deletions(-) diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4.yaml index 9566da382630d..457d5fc0cb5d4 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4.yaml @@ -9,10 +9,24 @@ images: - arm64 dockerfile_path: Dockerfile to: oadp-operator-1.4 + - dockerfile_path: build/ci-Dockerfile + to: test-oadp-operator +operator: + bundles: + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true promotion: to: - - name: oadp-operator + - excluded_images: + - test-oadp-operator + name: oadp-operator namespace: konveyor + - additional_images: + oadp-operator-bundle: oadp-operator-bundle + oadp-operator-e2e-tests: test-oadp-operator + namespace: konveyor + tag: oadp-1.4 resources: '*': limits: diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5.yaml index ba7e8f3382a1b..e2b8b579dc332 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5.yaml @@ -9,10 +9,24 @@ images: - arm64 dockerfile_path: Dockerfile to: oadp-operator-1.5 + - dockerfile_path: build/ci-Dockerfile + to: test-oadp-operator +operator: + bundles: + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true promotion: to: - - name: oadp-operator + - excluded_images: + - test-oadp-operator + name: oadp-operator namespace: konveyor + - additional_images: + oadp-operator-bundle: oadp-operator-bundle + oadp-operator-e2e-tests: test-oadp-operator + namespace: konveyor + tag: oadp-1.5 resources: '*': limits: diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-periodics.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-periodics.yaml index 574af36a7a2ca..aba18766e905f 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-periodics.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-periodics.yaml @@ -202,12 +202,14 @@ periodics: decoration_config: sparse_checkout_files: - Dockerfile + - build/ci-Dockerfile extra_refs: - base_ref: oadp-1.4 org: openshift repo: oadp-operator sparse_checkout_files: - Dockerfile + - build/ci-Dockerfile labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-postsubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-postsubmits.yaml index 9233ec2a789e2..85338ba100981 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-postsubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-postsubmits.yaml @@ -9,6 +9,7 @@ postsubmits: decoration_config: sparse_checkout_files: - Dockerfile + - build/ci-Dockerfile labels: capability/arm64: arm64 ci-operator.openshift.io/is-promotion: "true" @@ -24,6 +25,8 @@ postsubmits: - --promote - --report-credentials-file=/etc/report/credentials - --target=[images] + - --target=oadp-operator-bundle + - --target=test-oadp-operator command: - ci-operator image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest @@ -71,6 +74,7 @@ postsubmits: decoration_config: sparse_checkout_files: - Dockerfile + - build/ci-Dockerfile labels: ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-presubmits.yaml index a2e6314fc0027..71ef8aff8364b 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-presubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4-presubmits.yaml @@ -297,6 +297,63 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )4.18-images,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^oadp-1\.4$ + - ^oadp-1\.4- + cluster: build06 + context: ci/prow/ci-bundle-oadp-operator-bundle + decorate: true + decoration_config: + sparse_checkout_files: + - Dockerfile + - build/ci-Dockerfile + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-oadp-operator-oadp-1.4-ci-bundle-oadp-operator-bundle + rerun_command: /test ci-bundle-oadp-operator-bundle + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-credentials-file=/etc/report/credentials + - --target=oadp-operator-bundle + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - 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: 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( | .* )ci-bundle-oadp-operator-bundle,?($|\s.*) - agent: kubernetes always_run: true branches: @@ -308,6 +365,7 @@ presubmits: decoration_config: sparse_checkout_files: - Dockerfile + - build/ci-Dockerfile labels: capability/arm64: arm64 ci.openshift.io/generator: prowgen @@ -321,6 +379,8 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=[images] + - --target=oadp-operator-bundle + - --target=test-oadp-operator command: - ci-operator image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest @@ -365,6 +425,7 @@ presubmits: decoration_config: sparse_checkout_files: - Dockerfile + - build/ci-Dockerfile labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5-periodics.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5-periodics.yaml index ab2f7e3c5d3b4..e487cb38381c2 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5-periodics.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5-periodics.yaml @@ -823,12 +823,14 @@ periodics: decoration_config: sparse_checkout_files: - Dockerfile + - build/ci-Dockerfile extra_refs: - base_ref: oadp-1.5 org: openshift repo: oadp-operator sparse_checkout_files: - Dockerfile + - build/ci-Dockerfile labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5-postsubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5-postsubmits.yaml index fc24b50e934d7..da7232d2add8f 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5-postsubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5-postsubmits.yaml @@ -9,6 +9,7 @@ postsubmits: decoration_config: sparse_checkout_files: - Dockerfile + - build/ci-Dockerfile labels: capability/arm64: arm64 ci-operator.openshift.io/is-promotion: "true" @@ -24,6 +25,8 @@ postsubmits: - --promote - --report-credentials-file=/etc/report/credentials - --target=[images] + - --target=oadp-operator-bundle + - --target=test-oadp-operator command: - ci-operator image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest @@ -71,6 +74,7 @@ postsubmits: decoration_config: sparse_checkout_files: - Dockerfile + - build/ci-Dockerfile labels: ci.openshift.io/generator: prowgen max_concurrency: 1 diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5-presubmits.yaml index f3638427615f8..ab396a8c56df2 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5-presubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5-presubmits.yaml @@ -946,6 +946,63 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )4.20-images,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^oadp-1\.5$ + - ^oadp-1\.5- + cluster: build01 + context: ci/prow/ci-bundle-oadp-operator-bundle + decorate: true + decoration_config: + sparse_checkout_files: + - Dockerfile + - build/ci-Dockerfile + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-oadp-operator-oadp-1.5-ci-bundle-oadp-operator-bundle + rerun_command: /test ci-bundle-oadp-operator-bundle + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --report-credentials-file=/etc/report/credentials + - --target=oadp-operator-bundle + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - 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: 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( | .* )ci-bundle-oadp-operator-bundle,?($|\s.*) - agent: kubernetes always_run: true branches: @@ -957,6 +1014,7 @@ presubmits: decoration_config: sparse_checkout_files: - Dockerfile + - build/ci-Dockerfile labels: capability/arm64: arm64 ci.openshift.io/generator: prowgen @@ -970,6 +1028,8 @@ presubmits: - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - --report-credentials-file=/etc/report/credentials - --target=[images] + - --target=oadp-operator-bundle + - --target=test-oadp-operator command: - ci-operator image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest @@ -1014,6 +1074,7 @@ presubmits: decoration_config: sparse_checkout_files: - Dockerfile + - build/ci-Dockerfile labels: ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true"