From 0ecdfa6732ea956cb47d57e94ff65806eaa214dc Mon Sep 17 00:00:00 2001 From: Jatin Suri Date: Wed, 24 Sep 2025 16:04:04 -0400 Subject: [PATCH 1/4] Added ImageStreamImportMode to Origin's presubmit --- .../origin/openshift-origin-main.yaml | 9 +++ .../openshift-origin-main-presubmits.yaml | 75 +++++++++++++++++++ 2 files changed, 84 insertions(+) diff --git a/ci-operator/config/openshift/origin/openshift-origin-main.yaml b/ci-operator/config/openshift/origin/openshift-origin-main.yaml index 9755b298eb4d6..cdc470bc14c4d 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-main.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-main.yaml @@ -280,6 +280,15 @@ tests: enable: - observers-resource-watch workflow: openshift-upgrade-aws +- always_run: false + as: e2e-test-image-stream-import-mode + optional: true + steps: + cluster_profile: aws + env: + TEST_SUITE: openshift/test-image-stream-import-mode + workflow: openshift-e2e-aws + timeout: 8h0m0s - always_run: false as: e2e-aws-ovn-upgrade-rollback optional: true diff --git a/ci-operator/jobs/openshift/origin/openshift-origin-main-presubmits.yaml b/ci-operator/jobs/openshift/origin/openshift-origin-main-presubmits.yaml index add62d1947f1a..58c36d1563ce3 100644 --- a/ci-operator/jobs/openshift/origin/openshift-origin-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/origin/openshift-origin-main-presubmits.yaml @@ -5911,6 +5911,81 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )okd-scos-e2e-aws-ovn,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: build09 + context: ci/prow/e2e-test-image-stream-import-mode + decorate: true + decoration_config: + timeout: 8h0m0s + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-origin-main-e2e-test-image-stream-import-mode + optional: true + rerun_command: /test e2e-test-image-stream-import-mode + 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-image-stream-import-mode + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_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( | .* )e2e-test-image-stream-import-mode,?($|\s.*) - agent: kubernetes always_run: true branches: From 7332633311efe33cb62d2c2d7957fbb2070f32e7 Mon Sep 17 00:00:00 2001 From: Jatin Suri Date: Wed, 24 Sep 2025 16:45:44 -0400 Subject: [PATCH 2/4] ran make update --- .../openshift-origin-main-presubmits.yaml | 150 +++++++++--------- 1 file changed, 75 insertions(+), 75 deletions(-) diff --git a/ci-operator/jobs/openshift/origin/openshift-origin-main-presubmits.yaml b/ci-operator/jobs/openshift/origin/openshift-origin-main-presubmits.yaml index 58c36d1563ce3..694cbb98b4f14 100644 --- a/ci-operator/jobs/openshift/origin/openshift-origin-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/origin/openshift-origin-main-presubmits.yaml @@ -5433,6 +5433,81 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-openstack-serial,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^main$ + - ^main- + cluster: build09 + context: ci/prow/e2e-test-image-stream-import-mode + decorate: true + decoration_config: + timeout: 8h0m0s + labels: + ci-operator.openshift.io/cloud: aws + ci-operator.openshift.io/cloud-cluster-profile: aws + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-origin-main-e2e-test-image-stream-import-mode + optional: true + rerun_command: /test e2e-test-image-stream-import-mode + 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-image-stream-import-mode + command: + - ci-operator + image: quay-proxy.ci.openshift.org/openshift/ci:ci_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( | .* )e2e-test-image-stream-import-mode,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -5911,81 +5986,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )okd-scos-e2e-aws-ovn,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^master$ - - ^master- - cluster: build09 - context: ci/prow/e2e-test-image-stream-import-mode - decorate: true - decoration_config: - timeout: 8h0m0s - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-origin-main-e2e-test-image-stream-import-mode - optional: true - rerun_command: /test e2e-test-image-stream-import-mode - 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-image-stream-import-mode - command: - - ci-operator - image: quay-proxy.ci.openshift.org/openshift/ci:ci_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( | .* )e2e-test-image-stream-import-mode,?($|\s.*) - agent: kubernetes always_run: true branches: From 7a1d98721cdba34b475d20ef1467e81159e6010a Mon Sep 17 00:00:00 2001 From: Jatin Suri Date: Fri, 26 Sep 2025 11:14:26 -0400 Subject: [PATCH 3/4] fix e2e-test-image-stream-import-mode to include techpreviewnoupgrade --- .../config/openshift/origin/openshift-origin-main.yaml | 1 + .../openshift/origin/openshift-origin-main-presubmits.yaml | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ci-operator/config/openshift/origin/openshift-origin-main.yaml b/ci-operator/config/openshift/origin/openshift-origin-main.yaml index cdc470bc14c4d..176e4757e0a3b 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-main.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-main.yaml @@ -286,6 +286,7 @@ tests: steps: cluster_profile: aws env: + FEATURE_SET: TechPreviewNoUpgrade TEST_SUITE: openshift/test-image-stream-import-mode workflow: openshift-e2e-aws timeout: 8h0m0s diff --git a/ci-operator/jobs/openshift/origin/openshift-origin-main-presubmits.yaml b/ci-operator/jobs/openshift/origin/openshift-origin-main-presubmits.yaml index 0bd0979ee27b9..9b9a34a3dece8 100644 --- a/ci-operator/jobs/openshift/origin/openshift-origin-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/origin/openshift-origin-main-presubmits.yaml @@ -5438,11 +5438,7 @@ presubmits: branches: - ^main$ - ^main- -<<<<<<< HEAD - cluster: build09 -======= cluster: build06 ->>>>>>> b3d6d61d95ce2be6e76c0221423bf54c025c7d70 context: ci/prow/e2e-test-image-stream-import-mode decorate: true decoration_config: From e128779c1ac90b5d833fc83b70ae00d9096a9a89 Mon Sep 17 00:00:00 2001 From: Jatin Suri Date: Mon, 29 Sep 2025 15:03:43 -0400 Subject: [PATCH 4/4] Append techpreview to test name --- .../config/openshift/origin/openshift-origin-main.yaml | 4 ++-- .../origin/openshift-origin-main-presubmits.yaml | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ci-operator/config/openshift/origin/openshift-origin-main.yaml b/ci-operator/config/openshift/origin/openshift-origin-main.yaml index 59cfc12f78603..6944c4cd176c7 100644 --- a/ci-operator/config/openshift/origin/openshift-origin-main.yaml +++ b/ci-operator/config/openshift/origin/openshift-origin-main.yaml @@ -281,13 +281,13 @@ tests: - observers-resource-watch workflow: openshift-upgrade-aws - always_run: false - as: e2e-test-image-stream-import-mode + as: e2e-test-image-stream-import-mode-techpreview optional: true steps: cluster_profile: aws env: FEATURE_SET: TechPreviewNoUpgrade - TEST_SUITE: openshift/test-image-stream-import-mode + TEST_SUITE: openshift/test-image-stream-import-mode-techpreview workflow: openshift-e2e-aws timeout: 8h0m0s - always_run: false diff --git a/ci-operator/jobs/openshift/origin/openshift-origin-main-presubmits.yaml b/ci-operator/jobs/openshift/origin/openshift-origin-main-presubmits.yaml index 4a1edcd66af6a..9f7e16c43d5c0 100644 --- a/ci-operator/jobs/openshift/origin/openshift-origin-main-presubmits.yaml +++ b/ci-operator/jobs/openshift/origin/openshift-origin-main-presubmits.yaml @@ -5439,7 +5439,7 @@ presubmits: - ^main$ - ^main- cluster: build09 - context: ci/prow/e2e-test-image-stream-import-mode + context: ci/prow/e2e-test-image-stream-import-mode-techpreview decorate: true decoration_config: timeout: 8h0m0s @@ -5448,9 +5448,9 @@ presubmits: ci-operator.openshift.io/cloud-cluster-profile: aws ci.openshift.io/generator: prowgen pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-origin-main-e2e-test-image-stream-import-mode + name: pull-ci-openshift-origin-main-e2e-test-image-stream-import-mode-techpreview optional: true - rerun_command: /test e2e-test-image-stream-import-mode + rerun_command: /test e2e-test-image-stream-import-mode-techpreview spec: containers: - args: @@ -5459,7 +5459,7 @@ presubmits: - --lease-server-credentials-file=/etc/boskos/credentials - --report-credentials-file=/etc/report/credentials - --secret-dir=/secrets/ci-pull-credentials - - --target=e2e-test-image-stream-import-mode + - --target=e2e-test-image-stream-import-mode-techpreview command: - ci-operator image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest @@ -5507,7 +5507,7 @@ presubmits: - name: result-aggregator secret: secretName: result-aggregator - trigger: (?m)^/test( | .* )e2e-test-image-stream-import-mode,?($|\s.*) + trigger: (?m)^/test( | .* )e2e-test-image-stream-import-mode-techpreview,?($|\s.*) - agent: kubernetes always_run: false branches: