From 2962c6e34fcfe1cc44293b08eccf49d57b4ffc50 Mon Sep 17 00:00:00 2001 From: Tiger Kaovilai Date: Mon, 11 May 2026 17:26:12 -0400 Subject: [PATCH 1/5] feat: migrate OADP CI from deprecated OO_INDEX to OO_BUNDLE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Migrate all 15 oadp-operator variant CI configs from the deprecated index image path to the recommended operator-sdk bundle workflow. Changes per config: - operator.bundles: add `as: oadp-operator-bundle` + `skip_building_index: true` - dependencies: OO_INDEX: ci-index → OO_BUNDLE: oadp-operator-bundle - workflow: optional-operators-ci-aws → optional-operators-ci-operator-sdk-aws - env: replace OO_CHANNEL/OO_PACKAGE/OO_TARGET_NAMESPACES with OO_INSTALL_MODE: OwnNamespace The deprecated index image building will be removed from ci-operator soon. See: https://docs.ci.openshift.org/how-tos/testing-operator-sdk-operators/#building-an-index-deprecated Unblocks: https://github.com/openshift/oadp-operator/pull/2160 Generated with [Claude Code](https://claude.ai/code) via [Happy](https://happy.engineering) Co-Authored-By: Claude Co-Authored-By: Happy Signed-off-by: Tiger Kaovilai --- ...penshift-oadp-operator-oadp-1.0__4.12.yaml | 20 +++--- ...penshift-oadp-operator-oadp-1.0__4.14.yaml | 20 +++--- ...penshift-oadp-operator-oadp-1.3__4.12.yaml | 20 +++--- ...penshift-oadp-operator-oadp-1.3__4.13.yaml | 20 +++--- ...penshift-oadp-operator-oadp-1.3__4.14.yaml | 20 +++--- ...penshift-oadp-operator-oadp-1.3__4.15.yaml | 20 +++--- ...penshift-oadp-operator-oadp-1.4__4.18.yaml | 28 ++++---- ...penshift-oadp-operator-oadp-1.5__4.19.yaml | 52 ++++++-------- ...penshift-oadp-operator-oadp-1.5__4.20.yaml | 52 ++++++-------- ...penshift-oadp-operator-oadp-1.6__4.18.yaml | 12 ++-- ...penshift-oadp-operator-oadp-1.6__4.22.yaml | 68 ++++++++----------- ...openshift-oadp-operator-oadp-1.6__5.0.yaml | 68 ++++++++----------- ...penshift-oadp-operator-oadp-dev__4.22.yaml | 36 ++++------ ...penshift-oadp-operator-oadp-dev__4.23.yaml | 20 +++--- ...openshift-oadp-operator-oadp-dev__5.0.yaml | 52 ++++++-------- 15 files changed, 213 insertions(+), 295 deletions(-) diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.12.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.12.yaml index 47d0fb931aa12..9ddc5b93cadbf 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.12.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.12.yaml @@ -11,7 +11,9 @@ images: to: test-oadp-operator-1.0 operator: bundles: - - dockerfile_path: build/Dockerfile.bundle + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true substitutions: - pullspec: quay.io/konveyor/oadp-operator:oadp-1.0 with: oadp-operator-1.0 @@ -34,12 +36,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable-1.0 + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -53,7 +53,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - as: e2e-test-aws-periodic cron: 13 19 14,28 * * reporter_config: @@ -68,12 +68,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable-1.0 + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -87,7 +85,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws zz_generated_metadata: branch: oadp-1.0 org: openshift diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.14.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.14.yaml index dd13bba3de2fa..948c8b8c30136 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.14.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.14.yaml @@ -11,7 +11,9 @@ images: to: test-oadp-operator-1.0 operator: bundles: - - dockerfile_path: build/Dockerfile.bundle + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true substitutions: - pullspec: quay.io/konveyor/oadp-operator:oadp-1.0 with: oadp-operator-1.0 @@ -34,12 +36,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable-1.0 + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -53,7 +53,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - as: e2e-test-aws-periodic cron: 13 19 14,28 * * reporter_config: @@ -68,12 +68,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable-1.0 + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -87,7 +85,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws zz_generated_metadata: branch: oadp-1.0 org: openshift diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.12.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.12.yaml index 2994c691f9077..0fa2e9ed95cf1 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.12.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.12.yaml @@ -11,7 +11,9 @@ images: to: test-oadp-operator-1.3 operator: bundles: - - dockerfile_path: build/Dockerfile.bundle + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true substitutions: - pullspec: quay.io/konveyor/oadp-operator:oadp-1.3 with: oadp-operator-1.3 @@ -34,12 +36,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable-1.3 + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -53,7 +53,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - as: e2e-test-aws-periodic cron: 0 4 * * * reporter_config: @@ -68,12 +68,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable-1.3 + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -87,7 +85,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws zz_generated_metadata: branch: oadp-1.3 org: openshift diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.13.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.13.yaml index 754cff273d278..ee4d18bfb784e 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.13.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.13.yaml @@ -11,7 +11,9 @@ images: to: test-oadp-operator-1.3 operator: bundles: - - dockerfile_path: build/Dockerfile.bundle + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true substitutions: - pullspec: quay.io/konveyor/oadp-operator:oadp-1.3 with: oadp-operator-1.3 @@ -34,12 +36,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable-1.3 + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -53,7 +53,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - as: e2e-test-aws-periodic cron: 7 15 * * 0 reporter_config: @@ -68,12 +68,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable-1.3 + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -87,7 +85,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws zz_generated_metadata: branch: oadp-1.3 org: openshift diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.14.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.14.yaml index d46622e9060f7..4c33035a52865 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.14.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.14.yaml @@ -11,7 +11,9 @@ images: to: test-oadp-operator-1.3 operator: bundles: - - dockerfile_path: build/Dockerfile.bundle + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true substitutions: - pullspec: quay.io/konveyor/oadp-operator:oadp-1.3 with: oadp-operator-1.3 @@ -34,12 +36,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable-1.3 + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -53,7 +53,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - as: e2e-test-aws-periodic cron: 0 4 * * * reporter_config: @@ -68,12 +68,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable-1.3 + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -87,7 +85,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws zz_generated_metadata: branch: oadp-1.3 org: openshift diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.15.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.15.yaml index e394020976786..45686226b4e09 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.15.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3__4.15.yaml @@ -11,7 +11,9 @@ images: to: test-oadp-operator-1.3 operator: bundles: - - dockerfile_path: build/Dockerfile.bundle + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true substitutions: - pullspec: quay.io/konveyor/oadp-operator:oadp-1.3 with: oadp-operator-1.3 @@ -34,12 +36,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable-1.3 + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -53,7 +53,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - as: e2e-test-aws-periodic cron: 0 4 * * * reporter_config: @@ -68,12 +68,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable-1.3 + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -87,7 +85,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws zz_generated_metadata: branch: oadp-1.3 org: openshift diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.18.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.18.yaml index 1aa3d12b3bc55..9740a3d67b218 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.18.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.4__4.18.yaml @@ -11,7 +11,9 @@ images: to: test-oadp-operator-1.4 operator: bundles: - - dockerfile_path: build/Dockerfile.bundle + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true substitutions: - pullspec: quay.io/konveyor/oadp-operator:oadp-1.4 with: oadp-operator-1.4 @@ -35,14 +37,12 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: FEATURE_GATES: '[''OpenShiftPodSecurityAdmission=false'']' FEATURE_SET: CustomNoUpgrade - OO_CHANNEL: stable-1.4 + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -56,7 +56,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - as: e2e-test-aws-periodic cron: 0 4 * * * reporter_config: @@ -71,14 +71,12 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: FEATURE_GATES: '[''OpenShiftPodSecurityAdmission=false'']' FEATURE_SET: CustomNoUpgrade - OO_CHANNEL: stable-1.4 + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -92,19 +90,17 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - always_run: false as: e2e-test-hcp-aws run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable-1.4 + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -118,7 +114,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws zz_generated_metadata: branch: oadp-1.4 org: openshift diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5__4.19.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5__4.19.yaml index c204fe0ac8f85..f11df5eacdd96 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5__4.19.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5__4.19.yaml @@ -11,7 +11,9 @@ images: to: test-oadp-operator-1.5 operator: bundles: - - dockerfile_path: build/Dockerfile.bundle + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true substitutions: - pullspec: quay.io/konveyor/oadp-operator:oadp-1.5 with: oadp-operator-1.5 @@ -35,12 +37,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -54,7 +54,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - as: e2e-test-aws-periodic cron: 0 4 * * * reporter_config: @@ -69,12 +69,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -88,19 +86,17 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - always_run: false as: e2e-test-kubevirt-aws run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -114,7 +110,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - as: e2e-test-kubevirt-aws-periodic cron: 0 4 * * * reporter_config: @@ -129,12 +125,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -148,19 +142,17 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - always_run: false as: e2e-test-hcp-aws run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -174,18 +166,16 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - as: e2e-test-hcp-aws-periodic cron: 0 5 * * * steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -199,7 +189,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws zz_generated_metadata: branch: oadp-1.5 org: openshift diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5__4.20.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5__4.20.yaml index 8e77b9b8929cb..7c05e134d110b 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5__4.20.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.5__4.20.yaml @@ -11,7 +11,9 @@ images: to: test-oadp-operator-1.5 operator: bundles: - - dockerfile_path: build/Dockerfile.bundle + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true substitutions: - pullspec: quay.io/konveyor/oadp-operator:oadp-1.5 with: oadp-operator-1.5 @@ -35,12 +37,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -54,7 +54,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - as: e2e-test-aws-periodic cron: 0 4 * * * reporter_config: @@ -69,12 +69,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -88,19 +86,17 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - always_run: false as: e2e-test-kubevirt-aws run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -114,7 +110,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - as: e2e-test-kubevirt-aws-periodic cron: 0 4 * * * reporter_config: @@ -129,12 +125,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -148,19 +142,17 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - always_run: false as: e2e-test-hcp-aws run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -174,18 +166,16 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - as: e2e-test-hcp-aws-periodic cron: 0 5 * * * steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -199,7 +189,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws zz_generated_metadata: branch: oadp-1.5 org: openshift diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.18.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.18.yaml index 9fe564f5684c4..81df557703632 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.18.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.18.yaml @@ -11,7 +11,9 @@ images: to: test-oadp-operator-1.6 operator: bundles: - - dockerfile_path: build/Dockerfile.bundle + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true substitutions: - pullspec: quay.io/konveyor/oadp-operator:oadp-1.6 with: oadp-operator-1.6 @@ -34,12 +36,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -53,7 +53,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws zz_generated_metadata: branch: oadp-1.6 org: openshift diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.22.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.22.yaml index eb197763b2e4f..3be3d3dcedddf 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.22.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__4.22.yaml @@ -11,7 +11,9 @@ images: to: test-oadp-operator-1.6 operator: bundles: - - dockerfile_path: build/Dockerfile.bundle + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true substitutions: - pullspec: quay.io/konveyor/oadp-operator:oadp-1.6 with: oadp-operator-1.6 @@ -35,12 +37,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -54,19 +54,17 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - always_run: false as: e2e-test-aws run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -80,7 +78,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - as: e2e-test-aws-periodic cron: 0 4 * * * reporter_config: @@ -95,12 +93,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -114,19 +110,17 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - always_run: false as: e2e-test-kubevirt-aws run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -140,7 +134,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - as: e2e-test-kubevirt-aws-periodic cron: 0 4 * * * reporter_config: @@ -155,12 +149,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -174,19 +166,17 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - always_run: false as: e2e-test-hcp-aws run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -200,18 +190,16 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - as: e2e-test-hcp-aws-periodic cron: 0 5 * * * steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -225,18 +213,16 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - as: e2e-test-cli-aws-periodic cron: 0 2 * * * steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -250,7 +236,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws zz_generated_metadata: branch: oadp-1.6 org: openshift diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__5.0.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__5.0.yaml index e64f0e1eacb78..f2fa0fa86b878 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__5.0.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6__5.0.yaml @@ -11,7 +11,9 @@ images: to: test-oadp-operator-1.6 operator: bundles: - - dockerfile_path: build/Dockerfile.bundle + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true substitutions: - pullspec: quay.io/konveyor/oadp-operator:oadp-1.6 with: oadp-operator-1.6 @@ -35,12 +37,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -54,19 +54,17 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - always_run: false as: e2e-test-aws run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -80,7 +78,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - as: e2e-test-aws-periodic cron: 0 4 * * * reporter_config: @@ -95,12 +93,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -114,19 +110,17 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - always_run: false as: e2e-test-kubevirt-aws run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -140,7 +134,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - as: e2e-test-kubevirt-aws-periodic cron: 0 4 * * * reporter_config: @@ -155,12 +149,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -174,19 +166,17 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - always_run: false as: e2e-test-hcp-aws run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -200,18 +190,16 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - as: e2e-test-hcp-aws-periodic cron: 0 5 * * * steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -225,18 +213,16 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - as: e2e-test-cli-aws-periodic cron: 0 2 * * * steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: stable + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -250,7 +236,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws zz_generated_metadata: branch: oadp-1.6 org: openshift diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__4.22.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__4.22.yaml index bd276b59d79ba..7da2aea3e9ea9 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__4.22.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__4.22.yaml @@ -11,7 +11,9 @@ images: to: test-oadp-operator operator: bundles: - - dockerfile_path: build/Dockerfile.bundle + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true substitutions: - pullspec: quay.io/konveyor/oadp-operator:latest with: oadp-operator @@ -35,12 +37,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: dev + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -54,19 +54,17 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - always_run: false as: e2e-test-aws run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: dev + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -80,7 +78,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - as: e2e-test-aws-periodic cron: 0 4 * * * reporter_config: @@ -95,12 +93,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: dev + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -114,18 +110,16 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - as: e2e-test-cli-aws-periodic cron: 0 2 * * * steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: dev + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -139,7 +133,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws zz_generated_metadata: branch: oadp-dev org: openshift diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__4.23.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__4.23.yaml index dd674b5b0dd5d..a80e21cc185be 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__4.23.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__4.23.yaml @@ -11,7 +11,9 @@ images: to: test-oadp-operator operator: bundles: - - dockerfile_path: build/Dockerfile.bundle + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true substitutions: - pullspec: quay.io/konveyor/oadp-operator:latest with: oadp-operator @@ -36,12 +38,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: dev + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -55,7 +55,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - as: e2e-test-aws-periodic cron: 0 4 * * * reporter_config: @@ -70,12 +70,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: dev + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -89,7 +87,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws zz_generated_metadata: branch: oadp-dev org: openshift diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__5.0.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__5.0.yaml index c9b197106572e..78f8e108726b7 100644 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__5.0.yaml +++ b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-dev__5.0.yaml @@ -11,7 +11,9 @@ images: to: test-oadp-operator operator: bundles: - - dockerfile_path: build/Dockerfile.bundle + - as: oadp-operator-bundle + dockerfile_path: build/Dockerfile.bundle + skip_building_index: true substitutions: - pullspec: quay.io/konveyor/oadp-operator:latest with: oadp-operator @@ -35,12 +37,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: dev + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -54,19 +54,17 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - always_run: false as: e2e-test-aws run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: dev + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -80,7 +78,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - as: e2e-test-aws-periodic cron: 0 4 * * * reporter_config: @@ -95,12 +93,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: dev + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -114,7 +110,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - as: e2e-test-kubevirt-aws-periodic cron: 0 4 * * * reporter_config: @@ -129,12 +125,10 @@ tests: steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: dev + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -148,18 +142,16 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - as: e2e-test-hcp-aws-periodic cron: 0 5 * * * steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: dev + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -173,18 +165,16 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws - as: e2e-test-cli-aws-periodic cron: 0 2 * * * steps: cluster_profile: openshift-org-aws dependencies: - OO_INDEX: ci-index + OO_BUNDLE: oadp-operator-bundle env: - OO_CHANNEL: dev + OO_INSTALL_MODE: OwnNamespace OO_INSTALL_NAMESPACE: openshift-adp - OO_PACKAGE: oadp-operator - OO_TARGET_NAMESPACES: '!install' test: - as: e2e cli: latest @@ -198,7 +188,7 @@ tests: requests: cpu: 1000m memory: 512Mi - workflow: optional-operators-ci-aws + workflow: optional-operators-ci-operator-sdk-aws zz_generated_metadata: branch: oadp-dev org: openshift From bbe7be7938c215d733135f818370c216ca1fbf30 Mon Sep 17 00:00:00 2001 From: Tiger Kaovilai Date: Mon, 11 May 2026 18:25:46 -0400 Subject: [PATCH 2/5] chore: remove oadp-1.0 variant CI configs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OADP 1.0 is EOL — no need to maintain these CI configs. Only OADP 1.3+ configs are needed going forward. Generated with [Claude Code](https://claude.ai/code) via [Happy](https://happy.engineering) Co-Authored-By: Claude Co-Authored-By: Happy Signed-off-by: Tiger Kaovilai --- ...penshift-oadp-operator-oadp-1.0__4.12.yaml | 93 ------------------- ...penshift-oadp-operator-oadp-1.0__4.14.yaml | 93 ------------------- 2 files changed, 186 deletions(-) delete mode 100644 ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.12.yaml delete mode 100644 ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.14.yaml diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.12.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.12.yaml deleted file mode 100644 index 9ddc5b93cadbf..0000000000000 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.12.yaml +++ /dev/null @@ -1,93 +0,0 @@ -build_root: - image_stream_tag: - name: builder - namespace: ocp - tag: rhel-8-golang-1.19-openshift-4.12 -images: - items: - - dockerfile_path: Dockerfile - to: oadp-operator-1.0 - - dockerfile_path: build/ci-Dockerfile - to: test-oadp-operator-1.0 -operator: - bundles: - - as: oadp-operator-bundle - dockerfile_path: build/Dockerfile.bundle - skip_building_index: true - substitutions: - - pullspec: quay.io/konveyor/oadp-operator:oadp-1.0 - with: oadp-operator-1.0 -releases: - latest: - release: - channel: fast - version: "4.12" -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 1000m - memory: 512Mi -tests: -- always_run: false - as: e2e-test-aws - run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+ - steps: - cluster_profile: openshift-org-aws - dependencies: - OO_BUNDLE: oadp-operator-bundle - env: - OO_INSTALL_MODE: OwnNamespace - OO_INSTALL_NAMESPACE: openshift-adp - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.0 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-operator-sdk-aws -- as: e2e-test-aws-periodic - cron: 13 19 14,28 * * - reporter_config: - channel: '#oadp-cicd' - job_states_to_report: - - failure - - error - report_template: '{{if eq .Status.State "success"}} :rainbow: Job *{{.Spec.Job}}* - ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> :rainbow: {{else}} - :alert-siren: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View - logs> :alert-siren: {{end}}' - steps: - cluster_profile: openshift-org-aws - dependencies: - OO_BUNDLE: oadp-operator-bundle - env: - OO_INSTALL_MODE: OwnNamespace - OO_INSTALL_NAMESPACE: openshift-adp - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.0 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-operator-sdk-aws -zz_generated_metadata: - branch: oadp-1.0 - org: openshift - repo: oadp-operator - variant: "4.12" diff --git a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.14.yaml b/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.14.yaml deleted file mode 100644 index 948c8b8c30136..0000000000000 --- a/ci-operator/config/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0__4.14.yaml +++ /dev/null @@ -1,93 +0,0 @@ -build_root: - image_stream_tag: - name: builder - namespace: ocp - tag: rhel-8-golang-1.20-openshift-4.14 -images: - items: - - dockerfile_path: Dockerfile - to: oadp-operator-1.0 - - dockerfile_path: build/ci-Dockerfile - to: test-oadp-operator-1.0 -operator: - bundles: - - as: oadp-operator-bundle - dockerfile_path: build/Dockerfile.bundle - skip_building_index: true - substitutions: - - pullspec: quay.io/konveyor/oadp-operator:oadp-1.0 - with: oadp-operator-1.0 -releases: - latest: - release: - channel: fast - version: "4.14" -resources: - '*': - limits: - memory: 4Gi - requests: - cpu: 1000m - memory: 512Mi -tests: -- always_run: false - as: e2e-test-aws - run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+ - steps: - cluster_profile: openshift-org-aws - dependencies: - OO_BUNDLE: oadp-operator-bundle - env: - OO_INSTALL_MODE: OwnNamespace - OO_INSTALL_NAMESPACE: openshift-adp - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.0 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-operator-sdk-aws -- as: e2e-test-aws-periodic - cron: 13 19 14,28 * * - reporter_config: - channel: '#oadp-cicd' - job_states_to_report: - - failure - - error - report_template: '{{if eq .Status.State "success"}} :rainbow: Job *{{.Spec.Job}}* - ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> :rainbow: {{else}} - :alert-siren: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View - logs> :alert-siren: {{end}}' - steps: - cluster_profile: openshift-org-aws - dependencies: - OO_BUNDLE: oadp-operator-bundle - env: - OO_INSTALL_MODE: OwnNamespace - OO_INSTALL_NAMESPACE: openshift-adp - test: - - as: e2e - cli: latest - commands: make test-e2e - credentials: - - mount_path: /var/run/oadp-credentials - name: oadp-credentials - namespace: test-credentials - from: test-oadp-operator-1.0 - resources: - requests: - cpu: 1000m - memory: 512Mi - workflow: optional-operators-ci-operator-sdk-aws -zz_generated_metadata: - branch: oadp-1.0 - org: openshift - repo: oadp-operator - variant: "4.14" From 328cc329bf3a2da4a940f6a7681b6d1c62f86443 Mon Sep 17 00:00:00 2001 From: Tiger Kaovilai Date: Mon, 11 May 2026 23:43:58 -0400 Subject: [PATCH 3/5] chore: remove orphaned oadp-1.0 generated job files prowgen doesn't prune job files when source configs are deleted. Manual cleanup of generated jobs for removed oadp-1.0 variant configs. Generated with [Claude Code](https://claude.ai/code) via [Happy](https://happy.engineering) Co-Authored-By: Claude Co-Authored-By: Happy Signed-off-by: Tiger Kaovilai --- ...hift-oadp-operator-oadp-1.0-periodics.yaml | 279 --------- ...ft-oadp-operator-oadp-1.0-postsubmits.yaml | 133 ----- ...ift-oadp-operator-oadp-1.0-presubmits.yaml | 542 ------------------ 3 files changed, 954 deletions(-) delete mode 100644 ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-periodics.yaml delete mode 100644 ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-postsubmits.yaml delete mode 100644 ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-presubmits.yaml diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-periodics.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-periodics.yaml deleted file mode 100644 index 358803f7dc330..0000000000000 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-periodics.yaml +++ /dev/null @@ -1,279 +0,0 @@ -periodics: -- agent: kubernetes - cluster: build11 - cron: 13 19 14,28 * * - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - - build/ci-Dockerfile - extra_refs: - - base_ref: oadp-1.0 - org: openshift - repo: oadp-operator - sparse_checkout_files: - - Dockerfile - - build/ci-Dockerfile - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws - ci-operator.openshift.io/variant: "4.12" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-oadp-operator-oadp-1.0-4.12-e2e-test-aws-periodic - reporter_config: - slack: - channel: '#oadp-cicd' - job_states_to_report: - - failure - - error - report_template: '{{if eq .Status.State "success"}} :rainbow: Job *{{.Spec.Job}}* - ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> :rainbow: {{else}} - :alert-siren: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View - logs> :alert-siren: {{end}}' - 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-test-aws-periodic - - --variant=4.12 - 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 -- agent: kubernetes - cluster: build11 - cron: 13 19 14,28 * * - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - - build/ci-Dockerfile - extra_refs: - - base_ref: oadp-1.0 - org: openshift - repo: oadp-operator - sparse_checkout_files: - - Dockerfile - - build/ci-Dockerfile - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws - ci-operator.openshift.io/variant: "4.14" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-oadp-operator-oadp-1.0-4.14-e2e-test-aws-periodic - reporter_config: - slack: - channel: '#oadp-cicd' - job_states_to_report: - - failure - - error - report_template: '{{if eq .Status.State "success"}} :rainbow: Job *{{.Spec.Job}}* - ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> :rainbow: {{else}} - :alert-siren: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View - logs> :alert-siren: {{end}}' - 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-test-aws-periodic - - --variant=4.14 - 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 -- agent: kubernetes - cluster: build11 - cron: 0 4 * * * - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - extra_refs: - - base_ref: oadp-1.0 - org: openshift - repo: oadp-operator - sparse_checkout_files: - - Dockerfile - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-oadp-operator-oadp-1.0-unit-test-periodic - reporter_config: - slack: - channel: '#oadp-cicd' - job_states_to_report: - - failure - - error - report_template: '{{if eq .Status.State "success"}} :rainbow: Job *{{.Spec.Job}}* - ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> :rainbow: {{else}} - :alert-siren: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View - logs> :alert-siren: {{end}}' - 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 - - --target=unit-test-periodic - 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/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: 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 diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-postsubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-postsubmits.yaml deleted file mode 100644 index 899e2aba371a1..0000000000000 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-postsubmits.yaml +++ /dev/null @@ -1,133 +0,0 @@ -postsubmits: - openshift/oadp-operator: - - agent: kubernetes - always_run: true - branches: - - ^oadp-1\.0$ - cluster: build04 - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - labels: - ci-operator.openshift.io/is-promotion: "true" - ci.openshift.io/generator: prowgen - max_concurrency: 1 - name: branch-ci-openshift-oadp-operator-oadp-1.0-images - spec: - containers: - - args: - - --gcs-upload-secret=/secrets/gcs/service-account.json - - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson - - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson - - --promote - - --report-credentials-file=/etc/report/credentials - - --target=[images] - 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/push-secret - name: push-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: push-secret - secret: - secretName: registry-push-credentials-ci-central - - name: result-aggregator - secret: - secretName: result-aggregator - - agent: kubernetes - always_run: true - branches: - - ^oadp-1\.0$ - cluster: build04 - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - labels: - ci.openshift.io/generator: prowgen - max_concurrency: 1 - name: branch-ci-openshift-oadp-operator-oadp-1.0-unit-test-post - 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 - - --target=unit-test-post - 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/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: 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 diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-presubmits.yaml deleted file mode 100644 index 4d895590f5e19..0000000000000 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-presubmits.yaml +++ /dev/null @@ -1,542 +0,0 @@ -presubmits: - openshift/oadp-operator: - - agent: kubernetes - always_run: true - branches: - - ^oadp-1\.0$ - - ^oadp-1\.0- - cluster: build03 - context: ci/prow/4.12-ci-index - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - - build/ci-Dockerfile - labels: - ci-operator.openshift.io/variant: "4.12" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.0-4.12-ci-index - rerun_command: /test 4.12-ci-index - 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=ci-index - - --variant=4.12 - 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( | .* )4.12-ci-index,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^oadp-1\.0$ - - ^oadp-1\.0- - cluster: build01 - context: ci/prow/4.12-e2e-test-aws - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - - build/ci-Dockerfile - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws - ci-operator.openshift.io/variant: "4.12" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.0-4.12-e2e-test-aws - rerun_command: /test 4.12-e2e-test-aws - run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+ - 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-test-aws - - --variant=4.12 - 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( | .* )4.12-e2e-test-aws,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^oadp-1\.0$ - - ^oadp-1\.0- - cluster: build03 - context: ci/prow/4.12-images - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - - build/ci-Dockerfile - labels: - ci-operator.openshift.io/variant: "4.12" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.0-4.12-images - rerun_command: /test 4.12-images - 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=[images] - - --variant=4.12 - 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( | .* )4.12-images,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^oadp-1\.0$ - - ^oadp-1\.0- - cluster: build03 - context: ci/prow/4.14-ci-index - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - - build/ci-Dockerfile - labels: - ci-operator.openshift.io/variant: "4.14" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.0-4.14-ci-index - rerun_command: /test 4.14-ci-index - 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=ci-index - - --variant=4.14 - 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( | .* )4.14-ci-index,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^oadp-1\.0$ - - ^oadp-1\.0- - cluster: build01 - context: ci/prow/4.14-e2e-test-aws - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - - build/ci-Dockerfile - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: openshift-org-aws - ci-operator.openshift.io/variant: "4.14" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.0-4.14-e2e-test-aws - rerun_command: /test 4.14-e2e-test-aws - run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+ - 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-test-aws - - --variant=4.14 - 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( | .* )4.14-e2e-test-aws,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^oadp-1\.0$ - - ^oadp-1\.0- - cluster: build03 - context: ci/prow/4.14-images - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - - build/ci-Dockerfile - labels: - ci-operator.openshift.io/variant: "4.14" - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.0-4.14-images - rerun_command: /test 4.14-images - 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=[images] - - --variant=4.14 - 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( | .* )4.14-images,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^oadp-1\.0$ - - ^oadp-1\.0- - cluster: build03 - context: ci/prow/images - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.0-images - rerun_command: /test images - 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=[images] - 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( | .* )images,?($|\s.*) - - agent: kubernetes - always_run: true - branches: - - ^oadp-1\.0$ - - ^oadp-1\.0- - cluster: build03 - context: ci/prow/unit-test - decorate: true - decoration_config: - sparse_checkout_files: - - Dockerfile - labels: - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.0-unit-test - rerun_command: /test unit-test - 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 - - --target=unit-test - 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/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: 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( | .* )unit-test,?($|\s.*) From 475f360fe99de624be711afb0fc8905df2480301 Mon Sep 17 00:00:00 2001 From: Tiger Kaovilai Date: Tue, 12 May 2026 10:34:10 -0400 Subject: [PATCH 4/5] fix: regenerate jobs with latest prowgen for ci-bundle naming Latest prowgen renames ci-index validation jobs to ci-bundle-oadp-operator-bundle when skip_building_index is set. Also restores oadp-1.0 job files which are still needed for the default (non-variant) oadp-1.0 config's unit test jobs. Generated with [Claude Code](https://claude.ai/code) via [Happy](https://happy.engineering) Co-Authored-By: Claude Co-Authored-By: Happy Signed-off-by: Tiger Kaovilai --- ...hift-oadp-operator-oadp-1.0-periodics.yaml | 81 +++++++++++ ...ft-oadp-operator-oadp-1.0-postsubmits.yaml | 129 ++++++++++++++++++ ...ift-oadp-operator-oadp-1.0-presubmits.yaml | 128 +++++++++++++++++ ...ift-oadp-operator-oadp-1.3-presubmits.yaml | 44 +++--- ...ift-oadp-operator-oadp-1.4-presubmits.yaml | 11 +- ...ift-oadp-operator-oadp-1.5-presubmits.yaml | 22 ++- ...ift-oadp-operator-oadp-1.6-presubmits.yaml | 33 ++--- ...ift-oadp-operator-oadp-dev-presubmits.yaml | 33 ++--- 8 files changed, 403 insertions(+), 78 deletions(-) create mode 100644 ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-periodics.yaml create mode 100644 ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-postsubmits.yaml create mode 100644 ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-presubmits.yaml diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-periodics.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-periodics.yaml new file mode 100644 index 0000000000000..2bae4d0434baf --- /dev/null +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-periodics.yaml @@ -0,0 +1,81 @@ +periodics: +- agent: kubernetes + cron: 0 4 * * * + decorate: true + decoration_config: + skip_cloning: true + extra_refs: + - base_ref: oadp-1.0 + org: openshift + repo: oadp-operator + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: periodic-ci-openshift-oadp-operator-oadp-1.0-unit-test-periodic + reporter_config: + slack: + channel: '#oadp-cicd' + job_states_to_report: + - failure + - error + report_template: '{{if eq .Status.State "success"}} :rainbow: Job *{{.Spec.Job}}* + ended with *{{.Status.State}}*. <{{.Status.URL}}|View logs> :rainbow: {{else}} + :alert-siren: Job *{{.Spec.Job}}* ended with *{{.Status.State}}*. <{{.Status.URL}}|View + logs> :alert-siren: {{end}}' + 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 + - --target=unit-test-periodic + 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/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: 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 diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-postsubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-postsubmits.yaml new file mode 100644 index 0000000000000..cbd1aa4835b08 --- /dev/null +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-postsubmits.yaml @@ -0,0 +1,129 @@ +postsubmits: + openshift/oadp-operator: + - agent: kubernetes + always_run: true + branches: + - ^oadp-1\.0$ + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/is-promotion: "true" + ci.openshift.io/generator: prowgen + max_concurrency: 1 + name: branch-ci-openshift-oadp-operator-oadp-1.0-images + spec: + containers: + - args: + - --gcs-upload-secret=/secrets/gcs/service-account.json + - --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson + - --image-mirror-push-secret=/etc/push-secret/.dockerconfigjson + - --promote + - --report-credentials-file=/etc/report/credentials + - --target=[images] + 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/push-secret + name: push-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: push-secret + secret: + secretName: registry-push-credentials-ci-central + - name: result-aggregator + secret: + secretName: result-aggregator + - agent: kubernetes + always_run: true + branches: + - ^oadp-1\.0$ + decorate: true + decoration_config: + skip_cloning: true + labels: + ci.openshift.io/generator: prowgen + max_concurrency: 1 + name: branch-ci-openshift-oadp-operator-oadp-1.0-unit-test-post + 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 + - --target=unit-test-post + 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/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: 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 diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-presubmits.yaml new file mode 100644 index 0000000000000..05c3b0db6826a --- /dev/null +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-presubmits.yaml @@ -0,0 +1,128 @@ +presubmits: + openshift/oadp-operator: + - agent: kubernetes + always_run: true + branches: + - ^oadp-1\.0$ + - ^oadp-1\.0- + context: ci/prow/images + decorate: true + decoration_config: + skip_cloning: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-oadp-operator-oadp-1.0-images + rerun_command: /test images + 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=[images] + 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( | .* )images,?($|\s.*) + - agent: kubernetes + always_run: true + branches: + - ^oadp-1\.0$ + - ^oadp-1\.0- + context: ci/prow/unit-test + decorate: true + decoration_config: + skip_cloning: true + labels: + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-oadp-operator-oadp-1.0-unit-test + rerun_command: /test unit-test + 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 + - --target=unit-test + 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/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: 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( | .* )unit-test,?($|\s.*) diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-presubmits.yaml index b46f4d00a44ef..29c985fc5ad73 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-presubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-presubmits.yaml @@ -5,8 +5,7 @@ presubmits: branches: - ^oadp-1\.3$ - ^oadp-1\.3- - cluster: build11 - context: ci/prow/4.12-ci-index + context: ci/prow/4.12-ci-bundle-oadp-operator-bundle decorate: true decoration_config: sparse_checkout_files: @@ -16,15 +15,15 @@ presubmits: ci-operator.openshift.io/variant: "4.12" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.3-4.12-ci-index - rerun_command: /test 4.12-ci-index + name: pull-ci-openshift-oadp-operator-oadp-1.3-4.12-ci-bundle-oadp-operator-bundle + rerun_command: /test 4.12-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=ci-index + - --target=oadp-operator-bundle - --variant=4.12 command: - ci-operator @@ -58,7 +57,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.12-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )4.12-ci-bundle-oadp-operator-bundle,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -210,8 +209,7 @@ presubmits: branches: - ^oadp-1\.3$ - ^oadp-1\.3- - cluster: build11 - context: ci/prow/4.13-ci-index + context: ci/prow/4.13-ci-bundle-oadp-operator-bundle decorate: true decoration_config: sparse_checkout_files: @@ -221,15 +219,15 @@ presubmits: ci-operator.openshift.io/variant: "4.13" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.3-4.13-ci-index - rerun_command: /test 4.13-ci-index + name: pull-ci-openshift-oadp-operator-oadp-1.3-4.13-ci-bundle-oadp-operator-bundle + rerun_command: /test 4.13-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=ci-index + - --target=oadp-operator-bundle - --variant=4.13 command: - ci-operator @@ -263,7 +261,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.13-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )4.13-ci-bundle-oadp-operator-bundle,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -415,8 +413,7 @@ presubmits: branches: - ^oadp-1\.3$ - ^oadp-1\.3- - cluster: build11 - context: ci/prow/4.14-ci-index + context: ci/prow/4.14-ci-bundle-oadp-operator-bundle decorate: true decoration_config: sparse_checkout_files: @@ -426,15 +423,15 @@ presubmits: ci-operator.openshift.io/variant: "4.14" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.3-4.14-ci-index - rerun_command: /test 4.14-ci-index + name: pull-ci-openshift-oadp-operator-oadp-1.3-4.14-ci-bundle-oadp-operator-bundle + rerun_command: /test 4.14-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=ci-index + - --target=oadp-operator-bundle - --variant=4.14 command: - ci-operator @@ -468,7 +465,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.14-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )4.14-ci-bundle-oadp-operator-bundle,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -620,8 +617,7 @@ presubmits: branches: - ^oadp-1\.3$ - ^oadp-1\.3- - cluster: build11 - context: ci/prow/4.15-ci-index + context: ci/prow/4.15-ci-bundle-oadp-operator-bundle decorate: true decoration_config: sparse_checkout_files: @@ -631,15 +627,15 @@ presubmits: ci-operator.openshift.io/variant: "4.15" ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.3-4.15-ci-index - rerun_command: /test 4.15-ci-index + name: pull-ci-openshift-oadp-operator-oadp-1.3-4.15-ci-bundle-oadp-operator-bundle + rerun_command: /test 4.15-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=ci-index + - --target=oadp-operator-bundle - --variant=4.15 command: - ci-operator @@ -673,7 +669,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.15-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )4.15-ci-bundle-oadp-operator-bundle,?($|\s.*) - agent: kubernetes always_run: false branches: 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 6aafc45bf3545..d774773994296 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 @@ -5,8 +5,7 @@ presubmits: branches: - ^oadp-1\.4$ - ^oadp-1\.4- - cluster: build06 - context: ci/prow/4.18-ci-index + context: ci/prow/4.18-ci-bundle-oadp-operator-bundle decorate: true decoration_config: sparse_checkout_files: @@ -17,15 +16,15 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "4.18" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.4-4.18-ci-index - rerun_command: /test 4.18-ci-index + name: pull-ci-openshift-oadp-operator-oadp-1.4-4.18-ci-bundle-oadp-operator-bundle + rerun_command: /test 4.18-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=ci-index + - --target=oadp-operator-bundle - --variant=4.18 command: - ci-operator @@ -59,7 +58,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.18-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )4.18-ci-bundle-oadp-operator-bundle,?($|\s.*) - agent: kubernetes always_run: false branches: 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 403ef1f257d5f..cfde3917e6545 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 @@ -5,8 +5,7 @@ presubmits: branches: - ^oadp-1\.5$ - ^oadp-1\.5- - cluster: build01 - context: ci/prow/4.19-ci-index + context: ci/prow/4.19-ci-bundle-oadp-operator-bundle decorate: true decoration_config: sparse_checkout_files: @@ -17,15 +16,15 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "4.19" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.5-4.19-ci-index - rerun_command: /test 4.19-ci-index + name: pull-ci-openshift-oadp-operator-oadp-1.5-4.19-ci-bundle-oadp-operator-bundle + rerun_command: /test 4.19-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=ci-index + - --target=oadp-operator-bundle - --variant=4.19 command: - ci-operator @@ -59,7 +58,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.19-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )4.19-ci-bundle-oadp-operator-bundle,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -389,8 +388,7 @@ presubmits: branches: - ^oadp-1\.5$ - ^oadp-1\.5- - cluster: build01 - context: ci/prow/4.20-ci-index + context: ci/prow/4.20-ci-bundle-oadp-operator-bundle decorate: true decoration_config: sparse_checkout_files: @@ -401,15 +399,15 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "4.20" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.5-4.20-ci-index - rerun_command: /test 4.20-ci-index + name: pull-ci-openshift-oadp-operator-oadp-1.5-4.20-ci-bundle-oadp-operator-bundle + rerun_command: /test 4.20-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=ci-index + - --target=oadp-operator-bundle - --variant=4.20 command: - ci-operator @@ -443,7 +441,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.20-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )4.20-ci-bundle-oadp-operator-bundle,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-presubmits.yaml index d39c6f8ef498a..60a49867d2b5a 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-presubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-presubmits.yaml @@ -5,8 +5,7 @@ presubmits: branches: - ^oadp-1\.6$ - ^oadp-1\.6- - cluster: build01 - context: ci/prow/4.18-ci-index + context: ci/prow/4.18-ci-bundle-oadp-operator-bundle decorate: true decoration_config: sparse_checkout_files: @@ -17,15 +16,15 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "4.18" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.6-4.18-ci-index - rerun_command: /test 4.18-ci-index + name: pull-ci-openshift-oadp-operator-oadp-1.6-4.18-ci-bundle-oadp-operator-bundle + rerun_command: /test 4.18-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=ci-index + - --target=oadp-operator-bundle - --variant=4.18 command: - ci-operator @@ -59,7 +58,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.18-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )4.18-ci-bundle-oadp-operator-bundle,?($|\s.*) - agent: kubernetes always_run: true branches: @@ -125,8 +124,7 @@ presubmits: branches: - ^oadp-1\.6$ - ^oadp-1\.6- - cluster: build01 - context: ci/prow/4.22-ci-index + context: ci/prow/4.22-ci-bundle-oadp-operator-bundle decorate: true decoration_config: sparse_checkout_files: @@ -137,15 +135,15 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "4.22" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.6-4.22-ci-index - rerun_command: /test 4.22-ci-index + name: pull-ci-openshift-oadp-operator-oadp-1.6-4.22-ci-bundle-oadp-operator-bundle + rerun_command: /test 4.22-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=ci-index + - --target=oadp-operator-bundle - --variant=4.22 command: - ci-operator @@ -179,7 +177,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.22-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )4.22-ci-bundle-oadp-operator-bundle,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -597,8 +595,7 @@ presubmits: branches: - ^oadp-1\.6$ - ^oadp-1\.6- - cluster: build01 - context: ci/prow/5.0-ci-index + context: ci/prow/5.0-ci-bundle-oadp-operator-bundle decorate: true decoration_config: sparse_checkout_files: @@ -609,15 +606,15 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-1.6-5.0-ci-index - rerun_command: /test 5.0-ci-index + name: pull-ci-openshift-oadp-operator-oadp-1.6-5.0-ci-bundle-oadp-operator-bundle + rerun_command: /test 5.0-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=ci-index + - --target=oadp-operator-bundle - --variant=5.0 command: - ci-operator @@ -651,7 +648,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )5.0-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )5.0-ci-bundle-oadp-operator-bundle,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-presubmits.yaml index b8134424f5e3b..2dc9d72a825a5 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-presubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-presubmits.yaml @@ -5,8 +5,7 @@ presubmits: branches: - ^oadp-dev$ - ^oadp-dev- - cluster: build11 - context: ci/prow/4.22-ci-index + context: ci/prow/4.22-ci-bundle-oadp-operator-bundle decorate: true decoration_config: sparse_checkout_files: @@ -17,15 +16,15 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "4.22" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-dev-4.22-ci-index - rerun_command: /test 4.22-ci-index + name: pull-ci-openshift-oadp-operator-oadp-dev-4.22-ci-bundle-oadp-operator-bundle + rerun_command: /test 4.22-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=ci-index + - --target=oadp-operator-bundle - --variant=4.22 command: - ci-operator @@ -59,7 +58,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.22-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )4.22-ci-bundle-oadp-operator-bundle,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -301,8 +300,7 @@ presubmits: branches: - ^oadp-dev$ - ^oadp-dev- - cluster: build11 - context: ci/prow/4.23-ci-index + context: ci/prow/4.23-ci-bundle-oadp-operator-bundle decorate: true decoration_config: sparse_checkout_files: @@ -313,15 +311,15 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "4.23" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-dev-4.23-ci-index - rerun_command: /test 4.23-ci-index + name: pull-ci-openshift-oadp-operator-oadp-dev-4.23-ci-bundle-oadp-operator-bundle + rerun_command: /test 4.23-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=ci-index + - --target=oadp-operator-bundle - --variant=4.23 command: - ci-operator @@ -355,7 +353,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )4.23-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )4.23-ci-bundle-oadp-operator-bundle,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -510,8 +508,7 @@ presubmits: branches: - ^oadp-dev$ - ^oadp-dev- - cluster: build11 - context: ci/prow/5.0-ci-index + context: ci/prow/5.0-ci-bundle-oadp-operator-bundle decorate: true decoration_config: sparse_checkout_files: @@ -522,15 +519,15 @@ presubmits: ci.openshift.io/generator: prowgen job-release: "5.0" pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-oadp-operator-oadp-dev-5.0-ci-index - rerun_command: /test 5.0-ci-index + name: pull-ci-openshift-oadp-operator-oadp-dev-5.0-ci-bundle-oadp-operator-bundle + rerun_command: /test 5.0-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=ci-index + - --target=oadp-operator-bundle - --variant=5.0 command: - ci-operator @@ -564,7 +561,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )5.0-ci-index,?($|\s.*) + trigger: (?m)^/test( | .* )5.0-ci-bundle-oadp-operator-bundle,?($|\s.*) - agent: kubernetes always_run: false branches: From 6db49e92a49410c517b207d9b5e7979626540623 Mon Sep 17 00:00:00 2001 From: Tiger Kaovilai Date: Tue, 12 May 2026 11:06:20 -0400 Subject: [PATCH 5/5] fix: add cluster assignments to generated ci-bundle jobs Run sanitize-prow-jobs to add missing cluster: fields (build01, build11) to newly generated ci-bundle-oadp-operator-bundle presubmit jobs. Generated with [Claude Code](https://claude.ai/code) via [Happy](https://happy.engineering) Co-Authored-By: Claude Co-Authored-By: Happy Signed-off-by: Tiger Kaovilai --- .../openshift-oadp-operator-oadp-1.0-periodics.yaml | 1 + .../openshift-oadp-operator-oadp-1.0-postsubmits.yaml | 2 ++ .../openshift-oadp-operator-oadp-1.0-presubmits.yaml | 2 ++ .../openshift-oadp-operator-oadp-1.3-presubmits.yaml | 4 ++++ .../openshift-oadp-operator-oadp-1.4-presubmits.yaml | 1 + .../openshift-oadp-operator-oadp-1.5-presubmits.yaml | 2 ++ .../openshift-oadp-operator-oadp-1.6-presubmits.yaml | 3 +++ .../openshift-oadp-operator-oadp-dev-presubmits.yaml | 3 +++ 8 files changed, 18 insertions(+) diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-periodics.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-periodics.yaml index 2bae4d0434baf..cb1e36f197aa6 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-periodics.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-periodics.yaml @@ -1,5 +1,6 @@ periodics: - agent: kubernetes + cluster: build11 cron: 0 4 * * * decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-postsubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-postsubmits.yaml index cbd1aa4835b08..191a4937dcce5 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-postsubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-postsubmits.yaml @@ -4,6 +4,7 @@ postsubmits: always_run: true branches: - ^oadp-1\.0$ + cluster: build04 decorate: true decoration_config: skip_cloning: true @@ -63,6 +64,7 @@ postsubmits: always_run: true branches: - ^oadp-1\.0$ + cluster: build04 decorate: true decoration_config: skip_cloning: true diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-presubmits.yaml index 05c3b0db6826a..77e1bfe182d4a 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-presubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.0-presubmits.yaml @@ -5,6 +5,7 @@ presubmits: branches: - ^oadp-1\.0$ - ^oadp-1\.0- + cluster: build03 context: ci/prow/images decorate: true decoration_config: @@ -59,6 +60,7 @@ presubmits: branches: - ^oadp-1\.0$ - ^oadp-1\.0- + cluster: build03 context: ci/prow/unit-test decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-presubmits.yaml index 29c985fc5ad73..a947d06888756 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-presubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.3-presubmits.yaml @@ -5,6 +5,7 @@ presubmits: branches: - ^oadp-1\.3$ - ^oadp-1\.3- + cluster: build11 context: ci/prow/4.12-ci-bundle-oadp-operator-bundle decorate: true decoration_config: @@ -209,6 +210,7 @@ presubmits: branches: - ^oadp-1\.3$ - ^oadp-1\.3- + cluster: build11 context: ci/prow/4.13-ci-bundle-oadp-operator-bundle decorate: true decoration_config: @@ -413,6 +415,7 @@ presubmits: branches: - ^oadp-1\.3$ - ^oadp-1\.3- + cluster: build11 context: ci/prow/4.14-ci-bundle-oadp-operator-bundle decorate: true decoration_config: @@ -617,6 +620,7 @@ presubmits: branches: - ^oadp-1\.3$ - ^oadp-1\.3- + cluster: build11 context: ci/prow/4.15-ci-bundle-oadp-operator-bundle decorate: true decoration_config: 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 d774773994296..364ebe1eff6e5 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 @@ -5,6 +5,7 @@ presubmits: branches: - ^oadp-1\.4$ - ^oadp-1\.4- + cluster: build06 context: ci/prow/4.18-ci-bundle-oadp-operator-bundle decorate: true decoration_config: 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 cfde3917e6545..c03b5f767be82 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 @@ -5,6 +5,7 @@ presubmits: branches: - ^oadp-1\.5$ - ^oadp-1\.5- + cluster: build01 context: ci/prow/4.19-ci-bundle-oadp-operator-bundle decorate: true decoration_config: @@ -388,6 +389,7 @@ presubmits: branches: - ^oadp-1\.5$ - ^oadp-1\.5- + cluster: build01 context: ci/prow/4.20-ci-bundle-oadp-operator-bundle decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-presubmits.yaml index 60a49867d2b5a..96bfa08f3e543 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-presubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-1.6-presubmits.yaml @@ -5,6 +5,7 @@ presubmits: branches: - ^oadp-1\.6$ - ^oadp-1\.6- + cluster: build01 context: ci/prow/4.18-ci-bundle-oadp-operator-bundle decorate: true decoration_config: @@ -124,6 +125,7 @@ presubmits: branches: - ^oadp-1\.6$ - ^oadp-1\.6- + cluster: build01 context: ci/prow/4.22-ci-bundle-oadp-operator-bundle decorate: true decoration_config: @@ -595,6 +597,7 @@ presubmits: branches: - ^oadp-1\.6$ - ^oadp-1\.6- + cluster: build01 context: ci/prow/5.0-ci-bundle-oadp-operator-bundle decorate: true decoration_config: diff --git a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-presubmits.yaml b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-presubmits.yaml index 2dc9d72a825a5..3f3bc64471d79 100644 --- a/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-presubmits.yaml +++ b/ci-operator/jobs/openshift/oadp-operator/openshift-oadp-operator-oadp-dev-presubmits.yaml @@ -5,6 +5,7 @@ presubmits: branches: - ^oadp-dev$ - ^oadp-dev- + cluster: build11 context: ci/prow/4.22-ci-bundle-oadp-operator-bundle decorate: true decoration_config: @@ -300,6 +301,7 @@ presubmits: branches: - ^oadp-dev$ - ^oadp-dev- + cluster: build11 context: ci/prow/4.23-ci-bundle-oadp-operator-bundle decorate: true decoration_config: @@ -508,6 +510,7 @@ presubmits: branches: - ^oadp-dev$ - ^oadp-dev- + cluster: build11 context: ci/prow/5.0-ci-bundle-oadp-operator-bundle decorate: true decoration_config: