From c5c89bfbda9f0e7c23942a4e7c33c1c2cc1f2c84 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 31 May 2023 09:59:00 -0700 Subject: [PATCH 1/2] ci-operator/config/openshift/release: Drop cross-minor rollback jobs The job flavor was originally added in 083763496f (Add ovn-upgrade-rollback job for 4.7->4.8, 2021-02-24, #16260). The jobs have subsequently been cloned forward to new minors as part of the branching process. And as older jobs started failing, I'd been dropping them gradually like 856aab20df (ci-operator/config/openshift/release/openshift-release-master__ci-4.11-upgrade-from-stable-4.10: Drop failing rollback jobs, 2022-10-11, #33005). But rounding with Jamo, the jobs no longer serve a useful role, and as 856aab20df points out, rollbacks between minor releases are not supported. Drop the likely-to-fail and not-useful-even-when-it-passes jobs in their entirety, so they stop getting cloned forward during branching. I'm also adjusting the release controller changes from 421c921686 (Introducing Rollback informing jobs, 2023-05-19, #39488). I'm dropping 4.12 and earlier rollback informers, so we can focus on 4.13 while we feel out the new process. And I'm pivoting 4.13 away from the cross-minor job that this pull request drops, and towards the rollback-oldest-supported job that will help back [1]. [1]: https://issues.redhat.com/browse/OTA-455 --- ...ter__ci-4.12-upgrade-from-stable-4.11.yaml | 27 - ...ter__ci-4.13-upgrade-from-stable-4.12.yaml | 27 - ...ter__ci-4.14-upgrade-from-stable-4.13.yaml | 27 - .../openshift-release-master-periodics.yaml | 462 ------------------ .../_releases/priv/release-ocp-4.10.json | 9 +- .../_releases/priv/release-ocp-4.11.json | 9 +- .../_releases/priv/release-ocp-4.12.json | 9 +- .../_releases/priv/release-ocp-4.13.json | 9 +- .../_releases/release-ocp-4.10.json | 6 - .../_releases/release-ocp-4.11.json | 6 - .../_releases/release-ocp-4.12.json | 6 - .../_releases/release-ocp-4.13.json | 2 +- 12 files changed, 5 insertions(+), 594 deletions(-) diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.12-upgrade-from-stable-4.11.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.12-upgrade-from-stable-4.11.yaml index 75af8aa2d2246..a12ecc937c408 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.12-upgrade-from-stable-4.11.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.12-upgrade-from-stable-4.11.yaml @@ -81,19 +81,6 @@ tests: enable: - observers-resource-watch workflow: openshift-upgrade-aws-ovn -- as: e2e-aws-ovn-upgrade-rollback - interval: 24h - steps: - cluster_profile: aws-2 - env: - BASE_DOMAIN: aws-2.ci.openshift.org - TEST_TYPE: upgrade-conformance - TEST_UPGRADE_OPTIONS: abort-at=99 - observers: - enable: - - observers-resource-watch - workflow: openshift-upgrade-aws-ovn - timeout: 6h0m0s - as: e2e-gcp-ovn-upgrade cluster: build02 interval: 48h @@ -129,20 +116,6 @@ tests: enable: - observers-resource-watch workflow: openshift-upgrade-azure-ovn -- as: e2e-aws-sdn-upgrade-rollback - interval: 48h - steps: - cluster_profile: aws-2 - env: - BASE_DOMAIN: aws-2.ci.openshift.org - DELETE_MC: "false" - TEST_TYPE: upgrade - TEST_UPGRADE_OPTIONS: abort-at=99 - observers: - enable: - - observers-resource-watch - workflow: openshift-upgrade-aws-sdn - timeout: 6h0m0s - as: e2e-aws-uwm interval: 48h steps: diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.13-upgrade-from-stable-4.12.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.13-upgrade-from-stable-4.12.yaml index 728419cf7563c..c195ca032264d 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.13-upgrade-from-stable-4.12.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.13-upgrade-from-stable-4.12.yaml @@ -89,19 +89,6 @@ tests: enable: - observers-resource-watch workflow: openshift-upgrade-aws-ovn -- as: e2e-aws-ovn-upgrade-rollback - interval: 168h - steps: - cluster_profile: aws-2 - env: - BASE_DOMAIN: aws-2.ci.openshift.org - TEST_TYPE: upgrade-conformance - TEST_UPGRADE_OPTIONS: abort-at=99 - observers: - enable: - - observers-resource-watch - workflow: openshift-upgrade-aws-ovn - timeout: 6h0m0s - as: e2e-gcp-ovn-upgrade cluster: build02 interval: 168h @@ -138,20 +125,6 @@ tests: enable: - observers-resource-watch workflow: openshift-upgrade-azure-ovn -- as: e2e-aws-sdn-upgrade-rollback - interval: 168h - steps: - cluster_profile: aws-2 - env: - BASE_DOMAIN: aws-2.ci.openshift.org - DELETE_MC: "false" - TEST_TYPE: upgrade - TEST_UPGRADE_OPTIONS: abort-at=99 - observers: - enable: - - observers-resource-watch - workflow: openshift-upgrade-aws-sdn - timeout: 6h0m0s - as: e2e-aws-ovn-uwm interval: 168h steps: diff --git a/ci-operator/config/openshift/release/openshift-release-master__ci-4.14-upgrade-from-stable-4.13.yaml b/ci-operator/config/openshift/release/openshift-release-master__ci-4.14-upgrade-from-stable-4.13.yaml index 2e32e5d5fee71..1182066070ad3 100644 --- a/ci-operator/config/openshift/release/openshift-release-master__ci-4.14-upgrade-from-stable-4.13.yaml +++ b/ci-operator/config/openshift/release/openshift-release-master__ci-4.14-upgrade-from-stable-4.13.yaml @@ -89,19 +89,6 @@ tests: enable: - observers-resource-watch workflow: openshift-upgrade-aws-ovn -- as: e2e-aws-ovn-upgrade-rollback - interval: 168h - steps: - cluster_profile: aws-2 - env: - BASE_DOMAIN: aws-2.ci.openshift.org - TEST_TYPE: upgrade-conformance - TEST_UPGRADE_OPTIONS: abort-at=99 - observers: - enable: - - observers-resource-watch - workflow: openshift-upgrade-aws-ovn - timeout: 6h0m0s - as: e2e-gcp-ovn-upgrade cluster: build02 interval: 168h @@ -138,20 +125,6 @@ tests: enable: - observers-resource-watch workflow: openshift-upgrade-azure-ovn -- as: e2e-aws-sdn-upgrade-rollback - interval: 168h - steps: - cluster_profile: aws-2 - env: - BASE_DOMAIN: aws-2.ci.openshift.org - DELETE_MC: "false" - TEST_TYPE: upgrade - TEST_UPGRADE_OPTIONS: abort-at=99 - observers: - enable: - - observers-resource-watch - workflow: openshift-upgrade-aws-sdn - timeout: 6h0m0s - as: e2e-aws-ovn-uwm interval: 168h steps: diff --git a/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml b/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml index bb9bc8978e410..acd7c971a5a2a 100644 --- a/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml +++ b/ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml @@ -9446,83 +9446,6 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator -- agent: kubernetes - cluster: build01 - decorate: true - decoration_config: - skip_cloning: true - timeout: 6h0m0s - extra_refs: - - base_ref: master - org: openshift - repo: release - interval: 24h - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws-2 - ci-operator.openshift.io/variant: ci-4.12-upgrade-from-stable-4.11 - ci.openshift.io/generator: prowgen - ci.openshift.io/no-builds: "true" - job-release: "4.12" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-release-master-ci-4.12-upgrade-from-stable-4.11-e2e-aws-ovn-upgrade-rollback - 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 - - --secret-dir=/usr/local/e2e-aws-ovn-upgrade-rollback-cluster-profile - - --target=e2e-aws-ovn-upgrade-rollback - - --variant=ci-4.12-upgrade-from-stable-4.11 - 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: /usr/local/e2e-aws-ovn-upgrade-rollback-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - 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: cluster-profile - secret: - secretName: cluster-secrets-aws-2 - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - agent: kubernetes cluster: build01 decorate: true @@ -9675,83 +9598,6 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator -- agent: kubernetes - cluster: build01 - decorate: true - decoration_config: - skip_cloning: true - timeout: 6h0m0s - extra_refs: - - base_ref: master - org: openshift - repo: release - interval: 48h - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws-2 - ci-operator.openshift.io/variant: ci-4.12-upgrade-from-stable-4.11 - ci.openshift.io/generator: prowgen - ci.openshift.io/no-builds: "true" - job-release: "4.12" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-release-master-ci-4.12-upgrade-from-stable-4.11-e2e-aws-sdn-upgrade-rollback - 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 - - --secret-dir=/usr/local/e2e-aws-sdn-upgrade-rollback-cluster-profile - - --target=e2e-aws-sdn-upgrade-rollback - - --variant=ci-4.12-upgrade-from-stable-4.11 - 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: /usr/local/e2e-aws-sdn-upgrade-rollback-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - 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: cluster-profile - secret: - secretName: cluster-secrets-aws-2 - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - agent: kubernetes cluster: build01 decorate: true @@ -13236,83 +13082,6 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator -- agent: kubernetes - cluster: build01 - decorate: true - decoration_config: - skip_cloning: true - timeout: 6h0m0s - extra_refs: - - base_ref: master - org: openshift - repo: release - interval: 168h - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws-2 - ci-operator.openshift.io/variant: ci-4.13-upgrade-from-stable-4.12 - ci.openshift.io/generator: prowgen - ci.openshift.io/no-builds: "true" - job-release: "4.13" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-release-master-ci-4.13-upgrade-from-stable-4.12-e2e-aws-ovn-upgrade-rollback - 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 - - --secret-dir=/usr/local/e2e-aws-ovn-upgrade-rollback-cluster-profile - - --target=e2e-aws-ovn-upgrade-rollback - - --variant=ci-4.13-upgrade-from-stable-4.12 - 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: /usr/local/e2e-aws-ovn-upgrade-rollback-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - 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: cluster-profile - secret: - secretName: cluster-secrets-aws-2 - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - agent: kubernetes cluster: build01 decorate: true @@ -13541,83 +13310,6 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator -- agent: kubernetes - cluster: build01 - decorate: true - decoration_config: - skip_cloning: true - timeout: 6h0m0s - extra_refs: - - base_ref: master - org: openshift - repo: release - interval: 168h - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws-2 - ci-operator.openshift.io/variant: ci-4.13-upgrade-from-stable-4.12 - ci.openshift.io/generator: prowgen - ci.openshift.io/no-builds: "true" - job-release: "4.13" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-release-master-ci-4.13-upgrade-from-stable-4.12-e2e-aws-sdn-upgrade-rollback - 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 - - --secret-dir=/usr/local/e2e-aws-sdn-upgrade-rollback-cluster-profile - - --target=e2e-aws-sdn-upgrade-rollback - - --variant=ci-4.13-upgrade-from-stable-4.12 - 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: /usr/local/e2e-aws-sdn-upgrade-rollback-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - 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: cluster-profile - secret: - secretName: cluster-secrets-aws-2 - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - agent: kubernetes cluster: build01 decorate: true @@ -17262,83 +16954,6 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator -- agent: kubernetes - cluster: build01 - decorate: true - decoration_config: - skip_cloning: true - timeout: 6h0m0s - extra_refs: - - base_ref: master - org: openshift - repo: release - interval: 168h - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws-2 - ci-operator.openshift.io/variant: ci-4.14-upgrade-from-stable-4.13 - ci.openshift.io/generator: prowgen - ci.openshift.io/no-builds: "true" - job-release: "4.14" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-release-master-ci-4.14-upgrade-from-stable-4.13-e2e-aws-ovn-upgrade-rollback - 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 - - --secret-dir=/usr/local/e2e-aws-ovn-upgrade-rollback-cluster-profile - - --target=e2e-aws-ovn-upgrade-rollback - - --variant=ci-4.14-upgrade-from-stable-4.13 - 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: /usr/local/e2e-aws-ovn-upgrade-rollback-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - 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: cluster-profile - secret: - secretName: cluster-secrets-aws-2 - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - agent: kubernetes cluster: build01 decorate: true @@ -17567,83 +17182,6 @@ periodics: - name: result-aggregator secret: secretName: result-aggregator -- agent: kubernetes - cluster: build01 - decorate: true - decoration_config: - skip_cloning: true - timeout: 6h0m0s - extra_refs: - - base_ref: master - org: openshift - repo: release - interval: 168h - labels: - ci-operator.openshift.io/cloud: aws - ci-operator.openshift.io/cloud-cluster-profile: aws-2 - ci-operator.openshift.io/variant: ci-4.14-upgrade-from-stable-4.13 - ci.openshift.io/generator: prowgen - ci.openshift.io/no-builds: "true" - job-release: "4.14" - pj-rehearse.openshift.io/can-be-rehearsed: "true" - name: periodic-ci-openshift-release-master-ci-4.14-upgrade-from-stable-4.13-e2e-aws-sdn-upgrade-rollback - 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 - - --secret-dir=/usr/local/e2e-aws-sdn-upgrade-rollback-cluster-profile - - --target=e2e-aws-sdn-upgrade-rollback - - --variant=ci-4.14-upgrade-from-stable-4.13 - 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: /usr/local/e2e-aws-sdn-upgrade-rollback-cluster-profile - name: cluster-profile - - mountPath: /secrets/gcs - name: gcs-credentials - 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: cluster-profile - secret: - secretName: cluster-secrets-aws-2 - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - agent: kubernetes cluster: build01 decorate: true diff --git a/core-services/release-controller/_releases/priv/release-ocp-4.10.json b/core-services/release-controller/_releases/priv/release-ocp-4.10.json index 1bafd2ae5ab80..b2e4234b8a477 100644 --- a/core-services/release-controller/_releases/priv/release-ocp-4.10.json +++ b/core-services/release-controller/_releases/priv/release-ocp-4.10.json @@ -95,13 +95,6 @@ "name": "periodic-ci-openshift-release-master-ci-4.10-e2e-aws-techpreview-serial-priv" } }, - "aws-upgrade-rollback": { - "disabled": true, - "optional": true, - "prowJob": { - "name": "periodic-ci-openshift-release-master-ci-4.10-e2e-aws-upgrade-rollback-priv" - } - }, "aws-upi": { "disabled": true, "optional": true, @@ -424,4 +417,4 @@ } } } -} \ No newline at end of file +} diff --git a/core-services/release-controller/_releases/priv/release-ocp-4.11.json b/core-services/release-controller/_releases/priv/release-ocp-4.11.json index d47dabd88e948..cb474ac1d7db4 100644 --- a/core-services/release-controller/_releases/priv/release-ocp-4.11.json +++ b/core-services/release-controller/_releases/priv/release-ocp-4.11.json @@ -95,13 +95,6 @@ "name": "periodic-ci-openshift-release-master-ci-4.11-e2e-aws-techpreview-serial-priv" } }, - "aws-upgrade-rollback": { - "disabled": true, - "optional": true, - "prowJob": { - "name": "periodic-ci-openshift-release-master-ci-4.11-e2e-aws-upgrade-rollback-priv" - } - }, "aws-upi": { "disabled": true, "optional": true, @@ -454,4 +447,4 @@ } } } -} \ No newline at end of file +} diff --git a/core-services/release-controller/_releases/priv/release-ocp-4.12.json b/core-services/release-controller/_releases/priv/release-ocp-4.12.json index 896dcde9b6dd5..f794ded889c3b 100644 --- a/core-services/release-controller/_releases/priv/release-ocp-4.12.json +++ b/core-services/release-controller/_releases/priv/release-ocp-4.12.json @@ -65,13 +65,6 @@ "name": "periodic-ci-openshift-release-master-nightly-4.12-e2e-aws-ovn-single-node-serial-priv" } }, - "aws-ovn-upgrade-rollback": { - "disabled": true, - "optional": true, - "prowJob": { - "name": "periodic-ci-openshift-release-master-ci-4.12-upgrade-from-stable-4.11-e2e-aws-ovn-upgrade-rollback-priv" - } - }, "aws-sdn": { "disabled": true, "maxRetries": 3, @@ -476,4 +469,4 @@ } } } -} \ No newline at end of file +} diff --git a/core-services/release-controller/_releases/priv/release-ocp-4.13.json b/core-services/release-controller/_releases/priv/release-ocp-4.13.json index c7ca011c07bb5..3f143620a4352 100644 --- a/core-services/release-controller/_releases/priv/release-ocp-4.13.json +++ b/core-services/release-controller/_releases/priv/release-ocp-4.13.json @@ -65,13 +65,6 @@ "name": "periodic-ci-openshift-release-master-nightly-4.13-e2e-aws-ovn-single-node-serial-priv" } }, - "aws-ovn-upgrade-rollback": { - "disabled": true, - "optional": true, - "prowJob": { - "name": "periodic-ci-openshift-release-master-ci-4.13-upgrade-from-stable-4.12-e2e-aws-ovn-upgrade-rollback-priv" - } - }, "aws-sdn": { "disabled": true, "maxRetries": 3, @@ -551,4 +544,4 @@ } } } -} \ No newline at end of file +} diff --git a/core-services/release-controller/_releases/release-ocp-4.10.json b/core-services/release-controller/_releases/release-ocp-4.10.json index e95ea95632c9a..ffa3089e7bad3 100644 --- a/core-services/release-controller/_releases/release-ocp-4.10.json +++ b/core-services/release-controller/_releases/release-ocp-4.10.json @@ -57,12 +57,6 @@ "name": "periodic-ci-openshift-release-master-ci-4.10-e2e-aws-techpreview-serial" } }, - "aws-upgrade-rollback": { - "optional": true, - "prowJob": { - "name": "periodic-ci-openshift-release-master-ci-4.10-e2e-aws-upgrade-rollback" - } - }, "azure": { "optional": true, "prowJob": { diff --git a/core-services/release-controller/_releases/release-ocp-4.11.json b/core-services/release-controller/_releases/release-ocp-4.11.json index 5aad0efd160d8..98f40e085e1d1 100644 --- a/core-services/release-controller/_releases/release-ocp-4.11.json +++ b/core-services/release-controller/_releases/release-ocp-4.11.json @@ -43,12 +43,6 @@ "optional":true, "prowJob":{"name":"periodic-ci-openshift-release-master-ci-4.11-e2e-aws-techpreview-serial"} }, - "aws-upgrade-rollback": { - "optional": true, - "prowJob": { - "name": "periodic-ci-openshift-release-master-ci-4.11-e2e-aws-upgrade-rollback" - } - }, "azure":{ "optional":true, "prowJob":{"name":"periodic-ci-openshift-release-master-nightly-4.11-e2e-azure"} diff --git a/core-services/release-controller/_releases/release-ocp-4.12.json b/core-services/release-controller/_releases/release-ocp-4.12.json index 5afab9f8fd2e1..2c8aed8177508 100644 --- a/core-services/release-controller/_releases/release-ocp-4.12.json +++ b/core-services/release-controller/_releases/release-ocp-4.12.json @@ -128,12 +128,6 @@ "name": "periodic-ci-openshift-release-master-ci-4.12-e2e-aws-sdn-techpreview-serial" } }, - "aws-ovn-upgrade-rollback": { - "optional": true, - "prowJob": { - "name": "periodic-ci-openshift-release-master-ci-4.12-upgrade-from-stable-4.11-e2e-aws-ovn-upgrade-rollback" - } - }, "aws-upi": { "optional": true, "prowJob": { diff --git a/core-services/release-controller/_releases/release-ocp-4.13.json b/core-services/release-controller/_releases/release-ocp-4.13.json index d2da480d47a99..e605464650bbb 100644 --- a/core-services/release-controller/_releases/release-ocp-4.13.json +++ b/core-services/release-controller/_releases/release-ocp-4.13.json @@ -150,7 +150,7 @@ "aws-ovn-upgrade-rollback": { "optional": true, "prowJob": { - "name": "periodic-ci-openshift-release-master-ci-4.13-upgrade-from-stable-4.12-e2e-aws-ovn-upgrade-rollback" + "name": "periodic-ci-openshift-release-master-nightly-4.13-e2e-aws-ovn-upgrade-rollback-oldest-supported" } }, "aws-upi": { From fd0be5d38deb3e0518ed6e5582003650fd251c93 Mon Sep 17 00:00:00 2001 From: wking Date: Thu, 1 Jun 2023 15:31:54 -0700 Subject: [PATCH 2/2] hack/validate-release-controller-config: Supplemental Git diff Because [1]: ERROR: The following differences were found: 3a4 > 03c544e5d55a55ae9f19d0de7d786341 .//core-services/release-controller/_releases/priv/release-ocp-4.12.json 35d35 < 1826a1b520574b66f152f814811c19f6 .//core-services/release-controller/_releases/priv/release-ocp-4.13.json 42a43 ... tells me what files need changing, but not what changes to make to them. [1]: https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/openshift_release/39897/pull-ci-openshift-release-master-release-controller-config/1664331471080394752 --- hack/validate-release-controller-config.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hack/validate-release-controller-config.sh b/hack/validate-release-controller-config.sh index 01680f7c93d10..cd1b31a2c42b1 100755 --- a/hack/validate-release-controller-config.sh +++ b/hack/validate-release-controller-config.sh @@ -41,7 +41,8 @@ ERROR: $ make release-controllers ERROR: The following differences were found: EOF - diff <(echo "$PRE_RC_GEN") <(echo "$POST_RC_GEN") + diff <(echo "$PRE_RC_GEN") <(echo "$POST_RC_GEN") || true + git diff --exit-code && exit 1 fi