From 5ecb4035750f4a7d7ac6c2b0d380d98c1e1a9336 Mon Sep 17 00:00:00 2001 From: Wesley Hayutin Date: Tue, 19 Aug 2025 15:40:39 -0600 Subject: [PATCH 1/2] add hypershift-oadp as optional in oadp-1.4 --- ...penshift-oadp-operator-oadp-1.4__4.18.yaml | 28 +++++++ ...ift-oadp-operator-oadp-1.4-presubmits.yaml | 79 +++++++++++++++++++ 2 files changed, 107 insertions(+) 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 d93e5634e753b..e680dc285cbc1 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 @@ -86,6 +86,34 @@ tests: cpu: 1000m memory: 512Mi workflow: optional-operators-ci-aws +- always_run: false + as: e2e-test-hcp-aws + optional: true + run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh + steps: + cluster_profile: aws-2 + dependencies: + OO_INDEX: ci-index + env: + OO_CHANNEL: stable + OO_INSTALL_NAMESPACE: openshift-adp + OO_PACKAGE: oadp-operator + OO_TARGET_NAMESPACES: '!install' + test: + - as: e2e + cli: latest + commands: make TEST_HCP=true test-e2e + credentials: + - collection: "" + mount_path: /var/run/oadp-credentials + name: oadp-credentials + namespace: test-credentials + from: test-oadp-operator-1.4 + resources: + requests: + cpu: 1000m + memory: 512Mi + workflow: optional-operators-ci-aws zz_generated_metadata: branch: oadp-1.4 org: openshift 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 b065c0f77c47d..c6abf3c17ec2b 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 @@ -137,6 +137,85 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )4.18-e2e-test-aws,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^oadp-1\.4$ + - ^oadp-1\.4- + cluster: build01 + context: ci/prow/4.18-e2e-test-hcp-aws + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws-2 + ci-operator.openshift.io/variant: "4.18" + 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-e2e-test-hcp-aws + optional: true + rerun_command: /test 4.18-e2e-test-hcp-aws + run_if_changed: .+\.go|go\.(\bmod\b|\bsum\b)|Makefile|Dockerfile|.dockerignore|.*\.ya{0,1}ml|build/.+|.sh + 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-hcp-aws + - --variant=4.18 + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )4.18-e2e-test-hcp-aws,?($|\s.*) - agent: kubernetes always_run: true branches: From 594cccfe8b94696bfceba119e48a7dd8a4bd23e7 Mon Sep 17 00:00:00 2001 From: Wesley Hayutin Date: Wed, 3 Sep 2025 08:06:43 -0600 Subject: [PATCH 2/2] duh, update channel --- .../oadp-operator/openshift-oadp-operator-oadp-1.4__4.18.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e680dc285cbc1..5ebde46ebe124 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 @@ -95,7 +95,7 @@ tests: dependencies: OO_INDEX: ci-index env: - OO_CHANNEL: stable + OO_CHANNEL: stable-1.4 OO_INSTALL_NAMESPACE: openshift-adp OO_PACKAGE: oadp-operator OO_TARGET_NAMESPACES: '!install'