Skip to content

Commit 7ab53d7

Browse files
fix(mce): support HyperShift CLI extraction for MCE 2.10 (#69462)
For MCE 2.9 and above, extract hypershift binary directly from the operator pod using 'oc cp' instead of attempting to extract from brew registry image which may not be available.
1 parent f7e70cc commit 7ab53d7

13 files changed

+944
-41
lines changed

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

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,14 @@ resources:
5151
cpu: 100m
5252
memory: 200Mi
5353
tests:
54+
- as: e2e-aws-ovn-conformance
55+
minimum_interval: 72h
56+
steps:
57+
cluster_profile: aws-2
58+
env:
59+
EXTRA_ARGS: --multi-arch=false
60+
MCE_VERSION: "2.10"
61+
workflow: hypershift-mce-aws-conformance
5462
- as: e2e-agent-connected-ovn-ipv4-manual-conformance
5563
minimum_interval: 168h
5664
steps:
@@ -183,6 +191,113 @@ tests:
183191
- ref: hypershift-mce-agent-info
184192
- chain: hypershift-conformance
185193
workflow: hypershift-mce-agent-metal3-conformance
194+
- as: e2e-kubevirt-metal-ovn
195+
minimum_interval: 72h
196+
steps:
197+
cluster_profile: equinix-ocp-hcp
198+
env:
199+
HYPERSHIFT_NODE_COUNT: "2"
200+
LVM_OPERATOR_SUB_CHANNEL: stable-4.20
201+
MCE_VERSION: "2.10"
202+
ODF_OPERATOR_SUB_CHANNEL: stable-4.19
203+
ODF_OPERATOR_SUB_SOURCE: redhat-operators-v4-19
204+
REDHAT_OPERATORS_INDEX_TAG: v4.19
205+
workflow: hypershift-mce-kubevirt-baremetalds-conformance
206+
- as: e2e-kubevirt-azure-ovn
207+
minimum_interval: 72h
208+
steps:
209+
cluster_profile: azure4
210+
env:
211+
CNV_SUBSCRIPTION_SOURCE: cnv-prerelease-catalog-source
212+
HYPERSHIFT_NODE_COUNT: "2"
213+
MCE_VERSION: "2.10"
214+
ODF_BACKEND_STORAGE_CLASS: managed-csi
215+
ODF_OPERATOR_CHANNEL: stable-4.17
216+
TEST_INCLUDES: sig-kubevirt
217+
TEST_SUITE: openshift/conformance/parallel/minimal
218+
workflow: hypershift-mce-kubevirt-azure-conformance
219+
- as: e2e-kubevirt-metal-ovn-multinet
220+
minimum_interval: 168h
221+
steps:
222+
cluster_profile: equinix-ocp-hcp
223+
env:
224+
ATTACH_DEFAULT_NETWORK: "false"
225+
HYPERSHIFT_NODE_COUNT: "2"
226+
LVM_OPERATOR_SUB_CHANNEL: stable-4.20
227+
MCE_VERSION: "2.10"
228+
ODF_OPERATOR_SUB_CHANNEL: stable-4.19
229+
ODF_OPERATOR_SUB_SOURCE: redhat-operators-v4-19
230+
REDHAT_OPERATORS_INDEX_TAG: v4.19
231+
workflow: hypershift-mce-kubevirt-baremetalds-conformance
232+
- as: e2e-kubevirt-metal-ovn-multinet-default-net
233+
minimum_interval: 168h
234+
steps:
235+
cluster_profile: equinix-ocp-hcp
236+
env:
237+
ATTACH_DEFAULT_NETWORK: "true"
238+
HYPERSHIFT_NODE_COUNT: "2"
239+
LVM_OPERATOR_SUB_CHANNEL: stable-4.20
240+
MCE_VERSION: "2.10"
241+
ODF_OPERATOR_SUB_CHANNEL: stable-4.19
242+
ODF_OPERATOR_SUB_SOURCE: redhat-operators-v4-19
243+
REDHAT_OPERATORS_INDEX_TAG: v4.19
244+
workflow: hypershift-mce-kubevirt-baremetalds-conformance
245+
- as: e2e-kubevirt-aws-ovn-gpu
246+
minimum_interval: 336h
247+
steps:
248+
cluster_profile: aws-kubevirt
249+
dependencies:
250+
OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:stable-latest
251+
RELEASE_IMAGE_LATEST: release:stable-latest
252+
env:
253+
BASE_DOMAIN: cnv-qe.rhood.us
254+
MCE_VERSION: "2.10"
255+
workflow: hypershift-mce-kubevirt-gpu-conformance
256+
- as: e2e-ibmz-ovn-conformance
257+
minimum_interval: 168h
258+
steps:
259+
cluster_profile: aws-2
260+
env:
261+
MCE_VERSION: "2.10"
262+
workflow: hypershift-mce-ibmz-conformance
263+
- as: e2e-power-ovn-conformance
264+
minimum_interval: 168h
265+
steps:
266+
cluster_profile: aws-3
267+
env:
268+
MCE_VERSION: "2.10"
269+
workflow: hypershift-mce-power-conformance
270+
- as: e2e-x86-power-heterogeneous-conformance
271+
minimum_interval: 168h
272+
steps:
273+
cluster_profile: aws-3
274+
env:
275+
ADDITIONAL_HYPERSHIFT_NODEPOOL_CONFIG: |
276+
NAME_SUFFIX=power, CPU_ARCH=ppc64le, NODE_ARCH=ppc64le
277+
NAME_SUFFIX=x86, CPU_ARCH=x86_64, NODE_ARCH=amd64
278+
HYPERSHIFT_INFRA_AVAILABILITY_POLICY: HighlyAvailable
279+
HYPERSHIFT_NODE_COUNT: "1"
280+
IS_HETEROGENEOUS: "yes"
281+
MCE_VERSION: "2.10"
282+
TEST_SKIPS: ""
283+
USE_GLB: "no"
284+
test:
285+
- chain: hypershift-mce-power-test
286+
- ref: hypershift-mce-agent-info
287+
workflow: hypershift-mce-power-conformance
288+
- as: e2e-aws-critical
289+
cron: 0 0 29 2 *
290+
steps:
291+
cluster_profile: aws-2
292+
dependencies:
293+
HOSTEDCLUSTER_RELEASE_IMAGE_LATEST: release:420-latest
294+
env:
295+
MCE_VERSION: "2.10"
296+
TEST_SUITE: openshift/conformance/parallel/minimal
297+
test:
298+
- ref: hypershift-mce-multi-version-test-info
299+
- chain: hypershift-conformance
300+
workflow: hypershift-mce-aws-conformance
186301
- as: e2e-agent-critical
187302
cron: 0 0 29 2 *
188303
steps:

0 commit comments

Comments
 (0)