From 55f98cb0559209357e1098e17d5e376247747e6f Mon Sep 17 00:00:00 2001 From: Petr Muller Date: Thu, 10 Nov 2022 15:25:27 +0100 Subject: [PATCH] Wire heterogeneous upgrade jobs to multiarch release-controller --- .../_releases/priv/release-ocp-4.11-multi.json | 7 +++++++ .../_releases/priv/release-ocp-4.12-multi.json | 16 ++++++++++++++++ .../_releases/priv/release-ocp-4.13-multi.json | 16 ++++++++++++++++ .../_releases/release-ocp-4.11-multi.json | 4 ++++ .../_releases/release-ocp-4.12-multi.json | 10 ++++++++++ .../_releases/release-ocp-4.13-multi.json | 12 +++++++++++- 6 files changed, 64 insertions(+), 1 deletion(-) diff --git a/core-services/release-controller/_releases/priv/release-ocp-4.11-multi.json b/core-services/release-controller/_releases/priv/release-ocp-4.11-multi.json index e877865bc2c0d..d33e899c6f036 100644 --- a/core-services/release-controller/_releases/priv/release-ocp-4.11-multi.json +++ b/core-services/release-controller/_releases/priv/release-ocp-4.11-multi.json @@ -9,6 +9,13 @@ "pullSecretName": "source", "referenceMode": "source", "verify": { + "multi-aws-ovn-upgrade": { + "disabled": true, + "optional": true, + "prowJob": { + "name": "periodic-ci-openshift-multiarch-master-nightly-4.11-ocp-e2e-aws-ovn-heterogeneous-upgrade-priv" + } + }, "multi-e2e": { "disabled": true, "optional": true, diff --git a/core-services/release-controller/_releases/priv/release-ocp-4.12-multi.json b/core-services/release-controller/_releases/priv/release-ocp-4.12-multi.json index 41295c26a9a76..9e19bedcf026d 100644 --- a/core-services/release-controller/_releases/priv/release-ocp-4.12-multi.json +++ b/core-services/release-controller/_releases/priv/release-ocp-4.12-multi.json @@ -9,6 +9,22 @@ "pullSecretName": "source", "referenceMode": "source", "verify": { + "multi-aws-ovn-upgrade": { + "disabled": true, + "optional": true, + "prowJob": { + "name": "periodic-ci-openshift-multiarch-master-nightly-4.12-ocp-e2e-aws-ovn-heterogeneous-upgrade-priv" + } + }, + "multi-aws-ovn-upgrade-from-previous-stable": { + "disabled": true, + "optional": true, + "prowJob": { + "name": "periodic-ci-openshift-multiarch-master-nightly-4.12-upgrade-from-stable-4.11-ocp-e2e-aws-heterogeneous-upgrade-priv" + }, + "upgrade": true, + "upgradeFrom": "PreviousMinor" + }, "multi-e2e-ovn": { "disabled": true, "optional": true, diff --git a/core-services/release-controller/_releases/priv/release-ocp-4.13-multi.json b/core-services/release-controller/_releases/priv/release-ocp-4.13-multi.json index 2b129ebb3c7d4..ecfac211a4a59 100644 --- a/core-services/release-controller/_releases/priv/release-ocp-4.13-multi.json +++ b/core-services/release-controller/_releases/priv/release-ocp-4.13-multi.json @@ -9,6 +9,22 @@ "pullSecretName": "source", "referenceMode": "source", "verify": { + "multi-aws-ovn-upgrade": { + "disabled": true, + "optional": true, + "prowJob": { + "name": "periodic-ci-openshift-multiarch-master-nightly-4.13-ocp-e2e-aws-ovn-heterogeneous-upgrade-priv" + } + }, + "multi-aws-ovn-upgrade-from-previous-stable": { + "disabled": true, + "optional": true, + "prowJob": { + "name": "periodic-ci-openshift-multiarch-master-nightly-4.13-upgrade-from-stable-4.12-ocp-e2e-aws-heterogeneous-upgrade-priv" + }, + "upgrade": true, + "upgradeFrom": "PreviousMinor" + }, "multi-e2e-ovn": { "disabled": true, "optional": true, diff --git a/core-services/release-controller/_releases/release-ocp-4.11-multi.json b/core-services/release-controller/_releases/release-ocp-4.11-multi.json index c6a89708433b6..6cb003b061496 100644 --- a/core-services/release-controller/_releases/release-ocp-4.11-multi.json +++ b/core-services/release-controller/_releases/release-ocp-4.11-multi.json @@ -20,6 +20,10 @@ "multi-serial":{ "optional":true, "prowJob":{"name":"periodic-ci-openshift-multiarch-master-nightly-4.11-ocp-e2e-serial-aws-heterogeneous"} + }, + "multi-aws-ovn-upgrade": { + "optional":true, + "prowJob":{"name":"periodic-ci-openshift-multiarch-master-nightly-4.11-ocp-e2e-aws-ovn-heterogeneous-upgrade"} } } } diff --git a/core-services/release-controller/_releases/release-ocp-4.12-multi.json b/core-services/release-controller/_releases/release-ocp-4.12-multi.json index 07aa7f30cde2f..f7d7303ada954 100644 --- a/core-services/release-controller/_releases/release-ocp-4.12-multi.json +++ b/core-services/release-controller/_releases/release-ocp-4.12-multi.json @@ -18,6 +18,16 @@ "multi-serial-ovn":{ "optional":true, "prowJob":{"name":"periodic-ci-openshift-multiarch-master-nightly-4.12-ocp-e2e-serial-aws-ovn-heterogeneous"} + }, + "multi-aws-ovn-upgrade": { + "optional":true, + "prowJob":{"name":"periodic-ci-openshift-multiarch-master-nightly-4.12-ocp-e2e-aws-ovn-heterogeneous-upgrade"} + }, + "multi-aws-ovn-upgrade-from-previous-stable": { + "optional":true, + "prowJob": {"name": "periodic-ci-openshift-multiarch-master-nightly-4.12-upgrade-from-stable-4.11-ocp-e2e-aws-heterogeneous-upgrade"}, + "upgrade": true, + "upgradeFrom": "PreviousMinor" } } } diff --git a/core-services/release-controller/_releases/release-ocp-4.13-multi.json b/core-services/release-controller/_releases/release-ocp-4.13-multi.json index b9c2711397922..ad9897e1617c6 100644 --- a/core-services/release-controller/_releases/release-ocp-4.13-multi.json +++ b/core-services/release-controller/_releases/release-ocp-4.13-multi.json @@ -22,6 +22,16 @@ "prowJob": { "name": "periodic-ci-openshift-multiarch-master-nightly-4.13-ocp-e2e-serial-aws-ovn-heterogeneous" } + }, + "multi-aws-ovn-upgrade": { + "optional":true, + "prowJob":{"name":"periodic-ci-openshift-multiarch-master-nightly-4.13-ocp-e2e-aws-ovn-heterogeneous-upgrade"} + }, + "multi-aws-ovn-upgrade-from-previous-stable": { + "optional":true, + "prowJob": {"name": "periodic-ci-openshift-multiarch-master-nightly-4.13-upgrade-from-stable-4.12-ocp-e2e-aws-heterogeneous-upgrade"}, + "upgrade": true, + "upgradeFrom": "PreviousMinor" } } -} \ No newline at end of file +}