From 7e61725a48e073c086f3511ce9e0b2a755377c65 Mon Sep 17 00:00:00 2001 From: Dustin Row Date: Fri, 8 May 2026 08:12:22 -0700 Subject: [PATCH 1/2] ROSAENG-855: Add presubmit e2e smoke tests for rosa-e2e PRs Add two presubmit jobs that run critical smoke tests against HCP and Classic STS clusters when Go code or test files change in a PR: - e2e-rosa-hcp-smoke: Importance:Critical tests on HCP cluster - e2e-rosa-classic-smoke: Importance:Critical && Platform:Classic on Classic STS cluster Both use run_if_changed to skip docs-only PRs, stable channel 4.22, and the rosa-e2e-01 cluster profile. Jira: https://redhat.atlassian.net/browse/ROSAENG-855 --- .../openshift-online-rosa-e2e-main.yaml | 24 +++ ...shift-online-rosa-e2e-main-presubmits.yaml | 168 ++++++++++++++++++ 2 files changed, 192 insertions(+) diff --git a/ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main.yaml b/ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main.yaml index e8f470be4dfeb..e11270a73c3e0 100644 --- a/ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main.yaml +++ b/ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main.yaml @@ -40,6 +40,30 @@ tests: make lint container: from: src +- as: e2e-rosa-hcp-smoke + run_if_changed: ^(pkg/|test/|Containerfile|go\.(mod|sum)) + steps: + cluster_profile: rosa-e2e-01 + env: + CHANNEL_GROUP: stable + HOSTED_CP: "true" + LABEL_FILTER: Importance:Critical + OCM_LOGIN_ENV: staging + OPENSHIFT_VERSION: "4.22" + REPLICAS: "2" + workflow: rosa-e2e-hcp +- as: e2e-rosa-classic-smoke + run_if_changed: ^(pkg/|test/|Containerfile|go\.(mod|sum)) + steps: + cluster_profile: rosa-e2e-01 + env: + CHANNEL_GROUP: stable + HOSTED_CP: "false" + LABEL_FILTER: Importance:Critical && Platform:Classic + OCM_LOGIN_ENV: staging + OPENSHIFT_VERSION: "4.22" + REPLICAS: "2" + workflow: rosa-e2e-classic - as: rosa-ci-daily-status commands: scripts/ci-status-report.sh container: diff --git a/ci-operator/jobs/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main-presubmits.yaml b/ci-operator/jobs/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main-presubmits.yaml index be022fdec01d0..a40ece7b135ca 100644 --- a/ci-operator/jobs/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main-presubmits.yaml +++ b/ci-operator/jobs/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main-presubmits.yaml @@ -1,5 +1,173 @@ presubmits: openshift-online/rosa-e2e: + - agent: kubernetes + always_run: false + branches: + - ^main$ + - ^main- + cluster: build10 + context: ci/prow/e2e-rosa-classic-smoke + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: rosa-e2e-01 + ci.openshift.io/generator: prowgen + job-release: "4.22" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-online-rosa-e2e-main-e2e-rosa-classic-smoke + rerun_command: /test e2e-rosa-classic-smoke + run_if_changed: ^(pkg/|test/|Containerfile|go\.(mod|sum)) + 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-rosa-classic-smoke + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-rosa-classic-smoke,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^main$ + - ^main- + cluster: build10 + context: ci/prow/e2e-rosa-hcp-smoke + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: rosa-e2e-01 + ci.openshift.io/generator: prowgen + job-release: "4.22" + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-online-rosa-e2e-main-e2e-rosa-hcp-smoke + rerun_command: /test e2e-rosa-hcp-smoke + run_if_changed: ^(pkg/|test/|Containerfile|go\.(mod|sum)) + 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-rosa-hcp-smoke + command: + - ci-operator + env: + - name: HTTP_SERVER_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest + imagePullPolicy: Always + name: "" + ports: + - containerPort: 8080 + name: http + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /etc/boskos + name: boskos + readOnly: true + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - mountPath: /secrets/gcs + name: gcs-credentials + readOnly: true + - mountPath: /secrets/manifest-tool + name: manifest-tool-local-pusher + readOnly: true + - mountPath: /etc/pull-secret + name: pull-secret + readOnly: true + - mountPath: /etc/report + name: result-aggregator + readOnly: true + serviceAccountName: ci-operator + volumes: + - name: boskos + secret: + items: + - key: credentials + path: credentials + secretName: boskos-credentials + - name: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - name: manifest-tool-local-pusher + secret: + secretName: manifest-tool-local-pusher + - name: pull-secret + secret: + secretName: registry-pull-credentials + - name: result-aggregator + secret: + secretName: result-aggregator + trigger: (?m)^/test( | .* )e2e-rosa-hcp-smoke,?($|\s.*) - agent: kubernetes always_run: true branches: From 5576e9d638f1442ef8190883761b24ddd34a5d94 Mon Sep 17 00:00:00 2001 From: Dustin Row Date: Fri, 8 May 2026 09:42:15 -0700 Subject: [PATCH 2/2] Fix smoke test version: use 4.21 (latest stable in staging) --- .../rosa-e2e/openshift-online-rosa-e2e-main.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main.yaml b/ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main.yaml index e11270a73c3e0..d51b660a60d61 100644 --- a/ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main.yaml +++ b/ci-operator/config/openshift-online/rosa-e2e/openshift-online-rosa-e2e-main.yaml @@ -49,7 +49,7 @@ tests: HOSTED_CP: "true" LABEL_FILTER: Importance:Critical OCM_LOGIN_ENV: staging - OPENSHIFT_VERSION: "4.22" + OPENSHIFT_VERSION: "4.21" REPLICAS: "2" workflow: rosa-e2e-hcp - as: e2e-rosa-classic-smoke @@ -61,7 +61,7 @@ tests: HOSTED_CP: "false" LABEL_FILTER: Importance:Critical && Platform:Classic OCM_LOGIN_ENV: staging - OPENSHIFT_VERSION: "4.22" + OPENSHIFT_VERSION: "4.21" REPLICAS: "2" workflow: rosa-e2e-classic - as: rosa-ci-daily-status