Skip to content

Commit 832bf0a

Browse files
committed
Moving the jobs based on Hub fixation and dynamic HCP version
1 parent 5f10242 commit 832bf0a

File tree

4 files changed

+90
-58
lines changed

4 files changed

+90
-58
lines changed

ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.14__periodics-mce.yaml

Lines changed: 16 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,18 @@ releases:
4444
product: ocp
4545
stream: nightly
4646
version: "4.17"
47+
415-multi-latest:
48+
candidate:
49+
architecture: multi
50+
product: ocp
51+
stream: nightly
52+
version: "4.15"
53+
416-multi-latest:
54+
candidate:
55+
architecture: multi
56+
product: ocp
57+
stream: nightly
58+
version: "4.16"
4759
latest:
4860
candidate:
4961
product: ocp
@@ -148,66 +160,26 @@ tests:
148160
env:
149161
MCE_VERSION: "2.4"
150162
workflow: hypershift-mce-ibmz-conformance
151-
- as: hub415-mce25-e2e-mce-ibmz-conformance
163+
- as: hcp415-mce25-e2e-mce-ibmz-conformance
152164
cron: 58 21 7 * *
153165
steps:
154166
cluster_profile: aws
155167
dependencies:
156-
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:415-latest
168+
OCP_IMAGE_MULTI: release:415-multi-latest
157169
env:
158170
MCE_VERSION: "2.5"
159171
TEST_SUITE: openshift/conformance/parallel/minimal
160172
workflow: hypershift-mce-ibmz-conformance
161-
- as: hub415-mce26-e2e-mce-ibmz-conformance
173+
- as: hcp416-mce25-e2e-mce-ibmz-conformance
162174
cron: 58 21 7 * *
163175
steps:
164176
cluster_profile: aws
165177
dependencies:
166-
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:415-latest
178+
OCP_IMAGE_MULTI: release:416-multi-latest
167179
env:
168180
MCE_VERSION: "2.6"
169181
TEST_SUITE: openshift/conformance/parallel/minimal
170182
workflow: hypershift-mce-ibmz-conformance
171-
- as: hub415-mce27-e2e-mce-ibmz-conformance
172-
cron: 58 21 7 * *
173-
steps:
174-
cluster_profile: aws
175-
dependencies:
176-
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:415-latest
177-
env:
178-
MCE_VERSION: "2.7"
179-
TEST_SUITE: openshift/conformance/parallel/minimal
180-
workflow: hypershift-mce-ibmz-conformance
181-
- as: hub416-mce26-e2e-mce-ibmz-conformance
182-
cron: 58 21 7 * *
183-
steps:
184-
cluster_profile: aws
185-
dependencies:
186-
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:416-latest
187-
env:
188-
MCE_VERSION: "2.6"
189-
TEST_SUITE: openshift/conformance/parallel/minimal
190-
workflow: hypershift-mce-ibmz-conformance
191-
- as: hub416-mce27-e2e-mce-ibmz-conformance
192-
cron: 58 21 7 * *
193-
steps:
194-
cluster_profile: aws
195-
dependencies:
196-
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:416-latest
197-
env:
198-
MCE_VERSION: "2.7"
199-
TEST_SUITE: openshift/conformance/parallel/minimal
200-
workflow: hypershift-mce-ibmz-conformance
201-
- as: hub417-mce27-e2e-mce-ibmz-conformance
202-
cron: 58 21 7 * *
203-
steps:
204-
cluster_profile: aws
205-
dependencies:
206-
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:417-latest
207-
env:
208-
MCE_VERSION: "2.7"
209-
TEST_SUITE: openshift/conformance/parallel/minimal
210-
workflow: hypershift-mce-ibmz-conformance
211183
- as: e2e-aws-critical
212184
cron: 0 0 29 2 *
213185
steps:

ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.15__periodics-mce.yaml

Lines changed: 37 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,18 @@ releases:
3939
product: ocp
4040
stream: nightly
4141
version: "4.17"
42+
414-multi-latest:
43+
candidate:
44+
architecture: multi
45+
product: ocp
46+
stream: nightly
47+
version: "4.14"
48+
417-multi-latest:
49+
candidate:
50+
architecture: multi
51+
product: ocp
52+
stream: nightly
53+
version: "4.17"
4254
latest:
4355
candidate:
4456
product: ocp
@@ -169,24 +181,44 @@ tests:
169181
env:
170182
MCE_VERSION: "2.5"
171183
workflow: hypershift-mce-ibmz-conformance
172-
- as: hub414-mce25-e2e-mce-ibmz-conformance
184+
- as: hcp414-mce25-e2e-mce-ibmz-conformance
173185
cron: 58 21 7 * *
174186
steps:
175187
cluster_profile: aws
176188
dependencies:
177-
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:414-latest
189+
OCP_IMAGE_MULTI: release:414-multi-latest
178190
env:
179191
MCE_VERSION: "2.5"
180192
TEST_SUITE: openshift/conformance/parallel/minimal
181193
workflow: hypershift-mce-ibmz-conformance
182-
- as: hub417-mce27-e2e-mce-ibmz-conformance
194+
- as: hcp414-mce26-e2e-mce-ibmz-conformance
195+
cron: 58 21 7 * *
196+
steps:
197+
cluster_profile: aws
198+
dependencies:
199+
OCP_IMAGE_MULTI: release:414-multi-latest
200+
env:
201+
MCE_VERSION: "2.6"
202+
TEST_SUITE: openshift/conformance/parallel/minimal
203+
workflow: hypershift-mce-ibmz-conformance
204+
- as: hcp414-mce27-e2e-mce-ibmz-conformance
205+
cron: 58 21 7 * *
206+
steps:
207+
cluster_profile: aws
208+
dependencies:
209+
OCP_IMAGE_MULTI: release:414-multi-latest
210+
env:
211+
MCE_VERSION: "2.6"
212+
TEST_SUITE: openshift/conformance/parallel/minimal
213+
workflow: hypershift-mce-ibmz-conformance
214+
- as: hcp417-mce27-e2e-mce-ibmz-conformance
183215
cron: 58 21 7 * *
184216
steps:
185217
cluster_profile: aws
186218
dependencies:
187-
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:417-latest
219+
OCP_IMAGE_MULTI: release:417-multi-latest
188220
env:
189-
MCE_VERSION: "2.7"
221+
MCE_VERSION: "2.6"
190222
TEST_SUITE: openshift/conformance/parallel/minimal
191223
workflow: hypershift-mce-ibmz-conformance
192224
- as: e2e-power-ovn-conformance

ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.16__periodics-mce.yaml

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ releases:
3434
product: ocp
3535
stream: nightly
3636
version: "4.16"
37+
414-multi-latest:
38+
candidate:
39+
architecture: multi
40+
product: ocp
41+
stream: nightly
42+
version: "4.14"
3743
417-multi-latest:
3844
candidate:
3945
architecture: multi
@@ -229,24 +235,34 @@ tests:
229235
env:
230236
MCE_VERSION: "2.6"
231237
workflow: hypershift-mce-ibmz-conformance
232-
- as: hcp417-mce27-e2e-mce-ibmz-conformance
238+
- as: hcp414-mce26-e2e-mce-ibmz-conformance
233239
cron: 58 21 7 * *
234240
steps:
235241
cluster_profile: aws
236242
dependencies:
237-
OCP_IMAGE_MULTI: release:417-multi-latest
243+
OCP_IMAGE_MULTI: release:414-multi-latest
244+
env:
245+
MCE_VERSION: "2.6"
246+
TEST_SUITE: openshift/conformance/parallel/minimal
247+
workflow: hypershift-mce-ibmz-conformance
248+
- as: hcp414-mce27-e2e-mce-ibmz-conformance
249+
cron: 58 21 7 * *
250+
steps:
251+
cluster_profile: aws
252+
dependencies:
253+
OCP_IMAGE_MULTI: release:414-multi-latest
238254
env:
239255
MCE_VERSION: "2.7"
240256
TEST_SUITE: openshift/conformance/parallel/minimal
241257
workflow: hypershift-mce-ibmz-conformance
242-
- as: hub414-mce26-e2e-mce-ibmz-conformance
258+
- as: hcp417-mce27-e2e-mce-ibmz-conformance
243259
cron: 58 21 7 * *
244260
steps:
245261
cluster_profile: aws
246262
dependencies:
247-
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:414-latest
263+
OCP_IMAGE_MULTI: release:417-multi-latest
248264
env:
249-
MCE_VERSION: "2.6"
265+
MCE_VERSION: "2.7"
250266
TEST_SUITE: openshift/conformance/parallel/minimal
251267
workflow: hypershift-mce-ibmz-conformance
252268
- as: e2e-power-ovn-conformance

ci-operator/config/openshift/hypershift/openshift-hypershift-release-4.17__periodics-mce.yaml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,18 @@ releases:
3939
product: ocp
4040
stream: nightly
4141
version: "4.17"
42+
414-multi-latest:
43+
candidate:
44+
architecture: multi
45+
product: ocp
46+
stream: nightly
47+
version: "4.14"
48+
415-multi-latest:
49+
candidate:
50+
architecture: multi
51+
product: ocp
52+
stream: nightly
53+
version: "4.15"
4254
latest:
4355
candidate:
4456
product: ocp
@@ -210,22 +222,22 @@ tests:
210222
env:
211223
MCE_VERSION: "2.7"
212224
workflow: hypershift-mce-ibmz-conformance
213-
- as: hub415-mce27-e2e-mce-ibmz-conformance
225+
- as: hcp414-mce27-e2e-mce-ibmz-conformance
214226
cron: 58 21 7 * *
215227
steps:
216228
cluster_profile: aws
217229
dependencies:
218-
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:415-latest
230+
OCP_IMAGE_MULTI: release:414-multi-latest
219231
env:
220232
MCE_VERSION: "2.7"
221233
TEST_SUITE: openshift/conformance/parallel/minimal
222234
workflow: hypershift-mce-ibmz-conformance
223-
- as: hub416-mce27-e2e-mce-ibmz-conformance
235+
- as: hcp415-mce27-e2e-mce-ibmz-conformance
224236
cron: 58 21 7 * *
225237
steps:
226238
cluster_profile: aws
227239
dependencies:
228-
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:416-latest
240+
OCP_IMAGE_MULTI: release:415-multi-latest
229241
env:
230242
MCE_VERSION: "2.7"
231243
TEST_SUITE: openshift/conformance/parallel/minimal

0 commit comments

Comments
 (0)