From bb98df34c967aa7ccbf4915cb186a3958c7815fe Mon Sep 17 00:00:00 2001 From: Seth Jennings Date: Wed, 4 Feb 2026 15:24:43 -0600 Subject: [PATCH] hypershift: remove non-main previous release e2e jobs --- .../openshift-hypershift-release-4.19.yaml | 22 --- .../openshift-hypershift-release-4.20.yaml | 38 ----- .../openshift-hypershift-release-4.21.yaml | 38 ----- ...ft-hypershift-release-4.19-presubmits.yaml | 74 --------- ...ft-hypershift-release-4.20-presubmits.yaml | 147 ------------------ ...ft-hypershift-release-4.21-presubmits.yaml | 147 ------------------ 6 files changed, 466 deletions(-) diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.19.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.19.yaml index a8410d16b83e3..80149989e85c8 100644 --- a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.19.yaml +++ b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.19.yaml @@ -54,11 +54,6 @@ releases: include_built_images: true name: "4.19" namespace: ocp - latest-414: - candidate: - product: ocp - stream: ci - version: "4.14" latest-415: candidate: product: ocp @@ -201,23 +196,6 @@ tests: REQUEST_SERVING_COMPONENT_TEST: "true" TEST_CPO_OVERRIDE: "1" workflow: hypershift-aws-e2e-external -- as: e2e-aws-4-18 - capabilities: - - build-tmpfs - run_if_changed: ^(test/e2e|hypershift-operator) - steps: - cluster_profile: hypershift-aws - dependencies: - OCP_IMAGE_LATEST: release:latest-418 - OCP_IMAGE_N1: release:latest-417 - OCP_IMAGE_N2: release:latest-416 - OCP_IMAGE_N3: release:latest-415 - OCP_IMAGE_N4: release:latest-414 - OCP_IMAGE_PREVIOUS: release:initial-418 - env: - ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true" - REQUEST_SERVING_COMPONENT_TEST: "true" - workflow: hypershift-aws-e2e-external - as: e2e-kubevirt-aws-ovn-reduced skip_if_only_changed: (^(\.tekton|\.github|docs|examples|enhancements|contrib)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)|(/overrides\.yaml$)|(/\.testcoverage\.yml$) steps: diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.20.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.20.yaml index b0f08561888cc..adb380925bb9d 100644 --- a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.20.yaml +++ b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.20.yaml @@ -59,11 +59,6 @@ releases: include_built_images: true name: "4.20" namespace: ocp - latest-415: - candidate: - product: ocp - stream: ci - version: "4.15" latest-416: candidate: product: ocp @@ -141,22 +136,6 @@ tests: ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true" HYPERSHIFT_AZURE_LOCATION: centralus workflow: hypershift-azure-aks-e2e -- as: e2e-aks-4-19 - skip_if_only_changed: (^(\.tekton|\.github|docs|examples|enhancements|contrib|\.cursor)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)|(/overrides\.yaml$)|(^renovate\.json$)|(/\.testcoverage\.yml$)|(^\.gitlint$)|(^\.gitignore$) - steps: - cluster_profile: hypershift-aks - dependencies: - OCP_IMAGE_LATEST: release:latest-419 - OCP_IMAGE_N1: release:latest-418 - OCP_IMAGE_N2: release:latest-417 - OCP_IMAGE_N3: release:latest-416 - OCP_IMAGE_N4: release:latest-415 - OCP_IMAGE_PREVIOUS: release:initial-419 - env: - AUTH_THROUGH_CERTS: "true" - ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true" - HYPERSHIFT_AZURE_LOCATION: centralus - workflow: hypershift-azure-aks-e2e - as: e2e-aws capabilities: - build-tmpfs @@ -222,23 +201,6 @@ tests: REQUEST_SERVING_COMPONENT_TEST: "true" TEST_CPO_OVERRIDE: "1" workflow: hypershift-aws-e2e-external -- as: e2e-aws-4-19 - capabilities: - - build-tmpfs - run_if_changed: ^(test/e2e|hypershift-operator) - steps: - cluster_profile: hypershift-aws - dependencies: - OCP_IMAGE_LATEST: release:latest-419 - OCP_IMAGE_N1: release:latest-418 - OCP_IMAGE_N2: release:latest-417 - OCP_IMAGE_N3: release:latest-416 - OCP_IMAGE_N4: release:latest-415 - OCP_IMAGE_PREVIOUS: release:initial-419 - env: - ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true" - REQUEST_SERVING_COMPONENT_TEST: "true" - workflow: hypershift-aws-e2e-external - as: e2e-kubevirt-aws-ovn-reduced skip_if_only_changed: (^(\.tekton|\.github|docs|examples|enhancements|contrib|\.cursor)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)|(/overrides\.yaml$)|(^renovate\.json$)|(/\.testcoverage\.yml$)|(^\.gitlint$)|(^\.gitignore$) steps: diff --git a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.21.yaml b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.21.yaml index 6e5cc51d204f3..b6b82ebb8763e 100644 --- a/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.21.yaml +++ b/ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.21.yaml @@ -63,11 +63,6 @@ releases: include_built_images: true name: "4.21" namespace: ocp - latest-416: - candidate: - product: ocp - stream: ci - version: "4.16" latest-417: candidate: product: ocp @@ -150,22 +145,6 @@ tests: HYPERSHIFT_AZURE_MARKETPLACE_IMAGE_SKU: "" HYPERSHIFT_AZURE_MARKETPLACE_IMAGE_VERSION: "" workflow: hypershift-azure-aks-e2e -- as: e2e-aks-4-20 - skip_if_only_changed: (^(\.tekton|\.github|\.claude|docs|examples|enhancements|contrib|\.cursor)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)|(/overrides\.yaml$)|(^renovate\.json$)|(/\.testcoverage\.yml$)|(^\.gitlint$)|(^\.gitignore$) - steps: - cluster_profile: hypershift-aks - dependencies: - OCP_IMAGE_LATEST: release:latest-420 - OCP_IMAGE_N1: release:latest-419 - OCP_IMAGE_N2: release:latest-418 - OCP_IMAGE_N3: release:latest-417 - OCP_IMAGE_N4: release:latest-416 - OCP_IMAGE_PREVIOUS: release:initial-420 - env: - AUTH_THROUGH_CERTS: "true" - ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true" - HYPERSHIFT_AZURE_LOCATION: centralus - workflow: hypershift-azure-aks-e2e - as: e2e-aks-override run_if_changed: (/overrides\.yaml$) steps: @@ -245,23 +224,6 @@ tests: REQUEST_SERVING_COMPONENT_TEST: "true" TEST_CPO_OVERRIDE: "1" workflow: hypershift-aws-e2e-external -- as: e2e-aws-4-20 - capabilities: - - build-tmpfs - run_if_changed: ^(test/e2e|hypershift-operator) - steps: - cluster_profile: hypershift-aws - dependencies: - OCP_IMAGE_LATEST: release:latest-420 - OCP_IMAGE_N1: release:latest-419 - OCP_IMAGE_N2: release:latest-418 - OCP_IMAGE_N3: release:latest-417 - OCP_IMAGE_N4: release:latest-416 - OCP_IMAGE_PREVIOUS: release:initial-420 - env: - ENABLE_HYPERSHIFT_CERT_ROTATION_SCALE: "true" - REQUEST_SERVING_COMPONENT_TEST: "true" - workflow: hypershift-aws-e2e-external - as: e2e-kubevirt-aws-ovn-reduced skip_if_only_changed: (^(\.tekton|\.github|\.claude|docs|examples|enhancements|contrib|\.cursor)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)|(/overrides\.yaml$)|(^renovate\.json$)|(/\.testcoverage\.yml$)|(^\.gitlint$)|(^\.gitignore$) steps: diff --git a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.19-presubmits.yaml b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.19-presubmits.yaml index 0be4beb54ad3b..6583ff9561da3 100644 --- a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.19-presubmits.yaml +++ b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.19-presubmits.yaml @@ -147,80 +147,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^release-4\.19$ - - ^release-4\.19- - cluster: build01 - context: ci/prow/e2e-aws-4-18 - decorate: true - labels: - capability/build-tmpfs: build-tmpfs - ci-operator.openshift.io/cloud: hypershift-aws - ci-operator.openshift.io/cloud-cluster-profile: hypershift-aws - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-hypershift-release-4.19-e2e-aws-4-18 - rerun_command: /test e2e-aws-4-18 - run_if_changed: ^(test/e2e|hypershift-operator) - 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-aws-4-18 - 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-aws-4-18,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.20-presubmits.yaml b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.20-presubmits.yaml index 997cda5d37b16..d24faf788afce 100644 --- a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.20-presubmits.yaml +++ b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.20-presubmits.yaml @@ -73,79 +73,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-aks,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^release-4\.20$ - - ^release-4\.20- - cluster: build03 - context: ci/prow/e2e-aks-4-19 - decorate: true - labels: - ci-operator.openshift.io/cloud: hypershift-aks - ci-operator.openshift.io/cloud-cluster-profile: hypershift-aks - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-hypershift-release-4.20-e2e-aks-4-19 - rerun_command: /test e2e-aks-4-19 - skip_if_only_changed: (^(\.tekton|\.github|docs|examples|enhancements|contrib|\.cursor)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)|(/overrides\.yaml$)|(^renovate\.json$)|(/\.testcoverage\.yml$)|(^\.gitlint$)|(^\.gitignore$) - 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-aks-4-19 - 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-aks-4-19,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -220,80 +147,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^release-4\.20$ - - ^release-4\.20- - cluster: build01 - context: ci/prow/e2e-aws-4-19 - decorate: true - labels: - capability/build-tmpfs: build-tmpfs - ci-operator.openshift.io/cloud: hypershift-aws - ci-operator.openshift.io/cloud-cluster-profile: hypershift-aws - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-hypershift-release-4.20-e2e-aws-4-19 - rerun_command: /test e2e-aws-4-19 - run_if_changed: ^(test/e2e|hypershift-operator) - 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-aws-4-19 - 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-aws-4-19,?($|\s.*) - agent: kubernetes always_run: false branches: diff --git a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.21-presubmits.yaml b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.21-presubmits.yaml index ffa3ae32d41b7..2ccfca7c6f282 100644 --- a/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.21-presubmits.yaml +++ b/ci-operator/jobs/openshift/hypershift/openshift-hypershift-release-4.21-presubmits.yaml @@ -73,79 +73,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-aks,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^release-4\.21$ - - ^release-4\.21- - cluster: build08 - context: ci/prow/e2e-aks-4-20 - decorate: true - labels: - ci-operator.openshift.io/cloud: hypershift-aks - ci-operator.openshift.io/cloud-cluster-profile: hypershift-aks - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-hypershift-release-4.21-e2e-aks-4-20 - rerun_command: /test e2e-aks-4-20 - skip_if_only_changed: (^(\.tekton|\.github|\.claude|docs|examples|enhancements|contrib|\.cursor)/)|(^[A-Z]+\.md$)|((^|/)OWNERS$)|(/overrides\.yaml$)|(^renovate\.json$)|(/\.testcoverage\.yml$)|(^\.gitlint$)|(^\.gitignore$) - 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-aks-4-20 - 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-aks-4-20,?($|\s.*) - agent: kubernetes always_run: false branches: @@ -293,80 +220,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^release-4\.21$ - - ^release-4\.21- - cluster: build01 - context: ci/prow/e2e-aws-4-20 - decorate: true - labels: - capability/build-tmpfs: build-tmpfs - ci-operator.openshift.io/cloud: hypershift-aws - ci-operator.openshift.io/cloud-cluster-profile: hypershift-aws - ci.openshift.io/generator: prowgen - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: pull-ci-openshift-hypershift-release-4.21-e2e-aws-4-20 - rerun_command: /test e2e-aws-4-20 - run_if_changed: ^(test/e2e|hypershift-operator) - 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-aws-4-20 - 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-aws-4-20,?($|\s.*) - agent: kubernetes always_run: false branches: