Skip to content

Commit 0ee3026

Browse files
smg247smg247
authored
Revert "move 4.21 openshift/release variant periodics to azure4 due to lease …" (#69963)
This reverts commit fff78b1.
1 parent 3bde7aa commit 0ee3026

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

‎ci-operator/config/openshift/release/openshift-release-master__ci-4.21-upgrade-from-stable-4.20.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ tests:
8888
- as: e2e-azure-ovn-upgrade
8989
interval: 168h
9090
steps:
91-
cluster_profile: azure4
91+
cluster_profile: azure-2
9292
env:
9393
BASE_DOMAIN: ci2.azure.devcluster.openshift.com
9494
CONTROL_PLANE_INSTANCE_TYPE: Standard_D8as_v5
@@ -113,7 +113,7 @@ tests:
113113
- as: e2e-azure-runc-upgrade
114114
cron: '@weekly'
115115
steps:
116-
cluster_profile: azure4
116+
cluster_profile: azure-2
117117
env:
118118
BASE_DOMAIN: ci2.azure.devcluster.openshift.com
119119
CONTROL_PLANE_INSTANCE_TYPE: Standard_D8as_v5

‎ci-operator/config/openshift/release/openshift-release-master__ci-4.21.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ tests:
134134
- as: e2e-azure-ovn-techpreview
135135
interval: 168h
136136
steps:
137-
cluster_profile: azure4
137+
cluster_profile: azure-2
138138
env:
139139
BASE_DOMAIN: ci2.azure.devcluster.openshift.com
140140
FEATURE_SET: TechPreviewNoUpgrade
@@ -145,7 +145,7 @@ tests:
145145
- as: e2e-azure-ovn-serial
146146
interval: 168h
147147
steps:
148-
cluster_profile: azure4
148+
cluster_profile: azure-2
149149
env:
150150
BASE_DOMAIN: ci2.azure.devcluster.openshift.com
151151
observers:
@@ -155,7 +155,7 @@ tests:
155155
- as: e2e-azure-ovn-techpreview-serial
156156
interval: 168h
157157
steps:
158-
cluster_profile: azure4
158+
cluster_profile: azure-2
159159
env:
160160
BASE_DOMAIN: ci2.azure.devcluster.openshift.com
161161
FEATURE_SET: TechPreviewNoUpgrade
@@ -167,7 +167,7 @@ tests:
167167
- as: e2e-azure-ovn-upgrade
168168
interval: 168h
169169
steps:
170-
cluster_profile: azure4
170+
cluster_profile: azure-2
171171
env:
172172
BASE_DOMAIN: ci2.azure.devcluster.openshift.com
173173
FAIL_ON_CORE_DUMP: "true"
@@ -180,7 +180,7 @@ tests:
180180
- as: e2e-azure-ovn-techpreview-upgrade
181181
interval: 168h
182182
steps:
183-
cluster_profile: azure4
183+
cluster_profile: azure-2
184184
env:
185185
BASE_DOMAIN: ci2.azure.devcluster.openshift.com
186186
FAIL_ON_CORE_DUMP: "true"
@@ -194,7 +194,7 @@ tests:
194194
- as: e2e-azure-ovn-upgrade-out-of-change
195195
interval: 168h
196196
steps:
197-
cluster_profile: azure4
197+
cluster_profile: azure-2
198198
dependencies:
199199
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:latest
200200
OPENSHIFT_UPGRADE_RELEASE_IMAGE_OVERRIDE: release:initial
@@ -210,7 +210,7 @@ tests:
210210
- as: e2e-azure-cilium
211211
interval: 168h
212212
steps:
213-
cluster_profile: azure4
213+
cluster_profile: azure-2
214214
env:
215215
BASE_DOMAIN: ci2.azure.devcluster.openshift.com
216216
observers:
@@ -220,7 +220,7 @@ tests:
220220
- as: e2e-azure-ovn
221221
interval: 168h
222222
steps:
223-
cluster_profile: azure4
223+
cluster_profile: azure-2
224224
env:
225225
BASE_DOMAIN: ci2.azure.devcluster.openshift.com
226226
FAIL_ON_CORE_DUMP: "true"
@@ -364,7 +364,7 @@ tests:
364364
- as: e2e-azure-runc-upgrade
365365
cron: '@daily'
366366
steps:
367-
cluster_profile: azure4
367+
cluster_profile: azure-2
368368
env:
369369
BASE_DOMAIN: ci2.azure.devcluster.openshift.com
370370
FAIL_ON_CORE_DUMP: "true"

‎ci-operator/config/openshift/release/openshift-release-master__nightly-4.21.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -917,7 +917,7 @@ tests:
917917
- as: e2e-azure-csi
918918
interval: 168h
919919
steps:
920-
cluster_profile: azure4
920+
cluster_profile: azure-2
921921
env:
922922
BASE_DOMAIN: ci2.azure.devcluster.openshift.com
923923
ENABLE_LONG_CSI_CERTIFICATION_TESTS: "true"

‎ci-operator/jobs/openshift/release/openshift-release-master-periodics.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41431,7 +41431,7 @@ periodics:
4143141431
interval: 168h
4143241432
labels:
4143341433
ci-operator.openshift.io/cloud: azure4
41434-
ci-operator.openshift.io/cloud-cluster-profile: azure4
41434+
ci-operator.openshift.io/cloud-cluster-profile: azure-2
4143541435
ci-operator.openshift.io/variant: ci-4.21
4143641436
ci.openshift.io/generator: prowgen
4143741437
ci.openshift.io/no-builds: "true"
@@ -41507,7 +41507,7 @@ periodics:
4150741507
interval: 168h
4150841508
labels:
4150941509
ci-operator.openshift.io/cloud: azure4
41510-
ci-operator.openshift.io/cloud-cluster-profile: azure4
41510+
ci-operator.openshift.io/cloud-cluster-profile: azure-2
4151141511
ci-operator.openshift.io/variant: ci-4.21
4151241512
ci.openshift.io/generator: prowgen
4151341513
ci.openshift.io/no-builds: "true"
@@ -41583,7 +41583,7 @@ periodics:
4158341583
interval: 168h
4158441584
labels:
4158541585
ci-operator.openshift.io/cloud: azure4
41586-
ci-operator.openshift.io/cloud-cluster-profile: azure4
41586+
ci-operator.openshift.io/cloud-cluster-profile: azure-2
4158741587
ci-operator.openshift.io/variant: ci-4.21
4158841588
ci.openshift.io/generator: prowgen
4158941589
ci.openshift.io/no-builds: "true"
@@ -41659,7 +41659,7 @@ periodics:
4165941659
interval: 168h
4166041660
labels:
4166141661
ci-operator.openshift.io/cloud: azure4
41662-
ci-operator.openshift.io/cloud-cluster-profile: azure4
41662+
ci-operator.openshift.io/cloud-cluster-profile: azure-2
4166341663
ci-operator.openshift.io/variant: ci-4.21
4166441664
ci.openshift.io/generator: prowgen
4166541665
ci.openshift.io/no-builds: "true"
@@ -41736,7 +41736,7 @@ periodics:
4173641736
interval: 168h
4173741737
labels:
4173841738
ci-operator.openshift.io/cloud: azure4
41739-
ci-operator.openshift.io/cloud-cluster-profile: azure4
41739+
ci-operator.openshift.io/cloud-cluster-profile: azure-2
4174041740
ci-operator.openshift.io/variant: ci-4.21
4174141741
ci.openshift.io/generator: prowgen
4174241742
ci.openshift.io/no-builds: "true"
@@ -41813,7 +41813,7 @@ periodics:
4181341813
interval: 168h
4181441814
labels:
4181541815
ci-operator.openshift.io/cloud: azure4
41816-
ci-operator.openshift.io/cloud-cluster-profile: azure4
41816+
ci-operator.openshift.io/cloud-cluster-profile: azure-2
4181741817
ci-operator.openshift.io/variant: ci-4.21
4181841818
ci.openshift.io/generator: prowgen
4181941819
ci.openshift.io/no-builds: "true"
@@ -41890,7 +41890,7 @@ periodics:
4189041890
interval: 168h
4189141891
labels:
4189241892
ci-operator.openshift.io/cloud: azure4
41893-
ci-operator.openshift.io/cloud-cluster-profile: azure4
41893+
ci-operator.openshift.io/cloud-cluster-profile: azure-2
4189441894
ci-operator.openshift.io/variant: ci-4.21
4189541895
ci.openshift.io/generator: prowgen
4189641896
ci.openshift.io/no-builds: "true"
@@ -41967,7 +41967,7 @@ periodics:
4196741967
interval: 168h
4196841968
labels:
4196941969
ci-operator.openshift.io/cloud: azure4
41970-
ci-operator.openshift.io/cloud-cluster-profile: azure4
41970+
ci-operator.openshift.io/cloud-cluster-profile: azure-2
4197141971
ci-operator.openshift.io/variant: ci-4.21
4197241972
ci.openshift.io/generator: prowgen
4197341973
ci.openshift.io/no-builds: "true"
@@ -42043,7 +42043,7 @@ periodics:
4204342043
repo: release
4204442044
labels:
4204542045
ci-operator.openshift.io/cloud: azure4
42046-
ci-operator.openshift.io/cloud-cluster-profile: azure4
42046+
ci-operator.openshift.io/cloud-cluster-profile: azure-2
4204742047
ci-operator.openshift.io/variant: ci-4.21
4204842048
ci.openshift.io/generator: prowgen
4204942049
ci.openshift.io/no-builds: "true"
@@ -43416,7 +43416,7 @@ periodics:
4341643416
interval: 168h
4341743417
labels:
4341843418
ci-operator.openshift.io/cloud: azure4
43419-
ci-operator.openshift.io/cloud-cluster-profile: azure4
43419+
ci-operator.openshift.io/cloud-cluster-profile: azure-2
4342043420
ci-operator.openshift.io/variant: ci-4.21-upgrade-from-stable-4.20
4342143421
ci.openshift.io/generator: prowgen
4342243422
ci.openshift.io/no-builds: "true"
@@ -43492,7 +43492,7 @@ periodics:
4349243492
repo: release
4349343493
labels:
4349443494
ci-operator.openshift.io/cloud: azure4
43495-
ci-operator.openshift.io/cloud-cluster-profile: azure4
43495+
ci-operator.openshift.io/cloud-cluster-profile: azure-2
4349643496
ci-operator.openshift.io/variant: ci-4.21-upgrade-from-stable-4.20
4349743497
ci.openshift.io/generator: prowgen
4349843498
ci.openshift.io/no-builds: "true"
@@ -163958,7 +163958,7 @@ periodics:
163958163958
interval: 168h
163959163959
labels:
163960163960
ci-operator.openshift.io/cloud: azure4
163961-
ci-operator.openshift.io/cloud-cluster-profile: azure4
163961+
ci-operator.openshift.io/cloud-cluster-profile: azure-2
163962163962
ci-operator.openshift.io/variant: nightly-4.21
163963163963
ci.openshift.io/generator: prowgen
163964163964
ci.openshift.io/no-builds: "true"

0 commit comments

Comments
 (0)