Skip to content

Commit cb0cf75

Browse files
committed
Switch edpm-multinode github-check jobs to OCP - 4.18
This PR switched the edpm multinode github-check jobs to OCP- 4.18 Jobs: base, edpm_multinode, kuttl_multinode, podified_multinode and tempest_multinode.
1 parent 33e7769 commit cb0cf75

6 files changed

+21
-16
lines changed

zuul.d/adoption.yaml

+9-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
# nodeset and an ansible-controller.
44
- job:
55
name: cifmw-adoption-base
6-
parent: base-extracted-crc
6+
parent: base-crc-cloud
77
abstract: true
88
timeout: 14400
99
attempts: 1
10-
nodeset: centos-9-rhel-9-2-crc-extracted-2-39-0-3xl
10+
nodeset: centos-9-rhel-9-2-crc-extracted-2-48-0-3xl
1111
roles:
1212
- zuul: github.com/openstack-k8s-operators/ci-framework
1313
pre-run:
@@ -19,6 +19,7 @@
1919
- ci/playbooks/collect-logs.yml
2020
- ci/playbooks/multinode-autohold.yml
2121
vars: &adoption_vars
22+
enable_ramdisk: true
2223
osp_17_repos:
2324
- rhel-9-for-x86_64-baseos-eus-rpms
2425
- rhel-9-for-x86_64-appstream-eus-rpms
@@ -198,7 +199,7 @@
198199

199200
- job:
200201
name: cifmw-adoption-base-source-multinode
201-
parent: base-extracted-crc
202+
parent: base-crc-cloud
202203
abstract: true
203204
timeout: 14400
204205
attempts: 1
@@ -214,6 +215,7 @@
214215
- ci/playbooks/collect-logs.yml
215216
- ci/playbooks/multinode-autohold.yml
216217
vars:
218+
enable_ramdisk: true
217219
<<: *adoption_vars
218220
crc_ci_bootstrap_networking:
219221
networks: &multinode_networks
@@ -406,7 +408,7 @@
406408

407409
- job:
408410
name: cifmw-adoption-base-source-multinode-novacells
409-
parent: base-extracted-crc
411+
parent: base-crc-cloud
410412
abstract: true
411413
voting: false
412414
timeout: 14400
@@ -417,6 +419,7 @@
417419
pre-run: *multinode-prerun
418420
post-run: *multinode-postrun
419421
vars:
422+
enable_ramdisk: true
420423
<<: *adoption_vars
421424
crc_ci_bootstrap_networking:
422425
networks: *multinode_networks
@@ -491,13 +494,14 @@
491494

492495
- job:
493496
name: cifmw-adoption-base-multinode-networker
494-
parent: base-extracted-crc
497+
parent: base-crc-cloud
495498
abstract: true
496499
attempts: 1
497500
roles: *multinode-roles
498501
pre-run: *multinode-prerun
499502
post-run: *multinode-postrun
500503
vars:
504+
enable_ramdisk: true
501505
<<: *adoption_vars
502506
crc_ci_bootstrap_networking:
503507
networks: *multinode_networks

zuul.d/base.yaml

+5-4
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,10 @@
121121
# crc_ci_bootstrap_networking using *extra-vars*.
122122
- job:
123123
name: cifmw-podified-multinode-edpm-base-crc
124-
parent: base-extracted-crc
124+
parent: base-crc-cloud
125125
timeout: 10800
126126
attempts: 1
127-
nodeset: centos-9-medium-centos-9-crc-extracted-2-39-0-3xl
127+
nodeset: centos-9-medium-centos-9-crc-extracted-2-48-0-3xl
128128
irrelevant-files: *ir_files
129129
required-projects: &multinode_edpm_rp
130130
- openstack-k8s-operators/ci-framework
@@ -146,6 +146,7 @@
146146
- ci/playbooks/collect-logs.yml
147147
- ci/playbooks/multinode-autohold.yml
148148
vars: &multinode_edpm_vars
149+
enable_ramdisk: true
149150
zuul_log_collection: true
150151
registry_login_enabled: true
151152
push_registry: quay.rdoproject.org
@@ -210,7 +211,7 @@
210211
parent: base-extracted-crc-ci-bootstrap
211212
timeout: 10800
212213
attempts: 1
213-
nodeset: centos-9-medium-centos-9-crc-extracted-2-39-0-3xl
214+
nodeset: centos-9-medium-centos-9-crc-extracted-2-48-0-3xl
214215
irrelevant-files: *ir_files
215216
required-projects: *multinode_edpm_rp
216217
roles: *multinode_edpm_roles
@@ -231,7 +232,7 @@
231232
parent: base-extracted-crc-ci-bootstrap-staging
232233
timeout: 10800
233234
attempts: 1
234-
nodeset: centos-9-medium-centos-9-crc-extracted-2-39-0-3xl-vexxhost
235+
nodeset: centos-9-medium-centos-9-crc-extracted-2-48-0-3xl-vexxhost
235236
irrelevant-files: *ir_files
236237
required-projects: *multinode_edpm_rp
237238
roles: *multinode_edpm_roles

zuul.d/edpm_multinode.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
- job:
33
name: podified-multinode-edpm-deployment-crc-2comp
44
parent: podified-multinode-edpm-deployment-crc
5-
nodeset: centos-9-medium-2x-centos-9-crc-extracted-2-39-0-xxl
5+
nodeset: centos-9-medium-2x-centos-9-crc-extracted-2-48-0-xxl
66
description: |
77
A multinode EDPM Zuul job which has one controller, one extracted crc
88
and two compute nodes. It is used in whitebox neutron tempest plugin testing.
@@ -68,7 +68,7 @@
6868
- job:
6969
name: podified-multinode-edpm-deployment-crc-3comp
7070
parent: podified-multinode-edpm-deployment-crc
71-
nodeset: centos-9-medium-3x-centos-9-crc-extracted-2-39-0-xxl
71+
nodeset: centos-9-medium-3x-centos-9-crc-extracted-2-48-0-xxl
7272
vars:
7373
crc_ci_bootstrap_cloud_name: "{{ nodepool.cloud | replace('-nodepool-tripleo','') }}"
7474
crc_ci_bootstrap_networking:
@@ -144,7 +144,7 @@
144144
- job:
145145
name: podified-multinode-hci-deployment-crc-3comp
146146
parent: podified-multinode-edpm-deployment-crc
147-
nodeset: centos-9-medium-3x-centos-9-crc-extracted-2-39-0-xxl
147+
nodeset: centos-9-medium-3x-centos-9-crc-extracted-2-48-0-xxl
148148
vars:
149149
cifmw_edpm_deploy_hci: true
150150
crc_ci_bootstrap_cloud_name: "{{ nodepool.cloud | replace('-nodepool-tripleo','') }}"
@@ -235,7 +235,7 @@
235235
- job:
236236
name: podified-multinode-hci-deployment-crc-1comp
237237
parent: podified-multinode-edpm-deployment-crc
238-
nodeset: centos-9-medium-centos-9-crc-extracted-2-39-0-3xl
238+
nodeset: centos-9-medium-centos-9-crc-extracted-2-48-0-3xl
239239
vars:
240240
cifmw_edpm_deploy_hci: true
241241
cifmw_cephadm_single_host_defaults: true

zuul.d/kuttl_multinode.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
parent: cifmw-podified-multinode-edpm-base-crc
55
timeout: 7200
66
abstract: true
7-
nodeset: centos-9-medium-crc-extracted-2-39-0-3xl
7+
nodeset: centos-9-medium-crc-extracted-2-48-0-3xl
88
vars:
99
zuul_log_collection: true
1010
extra-vars:

zuul.d/podified_multinode.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
parent: cifmw-podified-multinode-edpm-base-crc
1313
timeout: 5400
1414
abstract: true
15-
nodeset: centos-9-medium-crc-extracted-2-39-0-3xl
15+
nodeset: centos-9-medium-crc-extracted-2-48-0-3xl
1616
run:
1717
- ci/playbooks/edpm/run.yml
1818
extra-vars:

zuul.d/tempest_multinode.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
parent: cifmw-podified-multinode-edpm-base-crc
55
timeout: 5400
66
abstract: true
7-
nodeset: centos-9-medium-crc-extracted-2-39-0-3xl
7+
nodeset: centos-9-medium-crc-extracted-2-48-0-3xl
88
description: |
99
Base multinode job definition for running test-operator.
1010
vars:

0 commit comments

Comments
 (0)