Skip to content

Commit 0069660

Browse files
committed
Replacing crc extracted jobs with crc-cloud
The CRC cloud would be used in the future and will replace the crc extracted images.
1 parent 3dc53b6 commit 0069660

6 files changed

+504
-4
lines changed

zuul.d/base.yaml

+15
Original file line numberDiff line numberDiff line change
@@ -309,3 +309,18 @@
309309
- ci/playbooks/e2e-prepare.yml
310310
- ci/playbooks/dump_zuul_data.yml
311311
- ci/playbooks/bootstrap-networking-mapper.yml
312+
313+
314+
######## CRC CLOUD ##########
315+
- job:
316+
name: cifmw-podified-multinode-edpm-base-crc-cloud
317+
parent: base-crc-cloud
318+
timeout: 10800
319+
attempts: 1
320+
nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-18-1-3xl
321+
irrelevant-files: *ir_files
322+
required-projects: *multinode_edpm_rp
323+
roles: *multinode_edpm_roles
324+
pre-run: *multinode_edpm_pre_run
325+
post-run: *multinode_edpm_post_run
326+
vars: *multinode_edpm_vars

zuul.d/edpm_multinode.yaml

+37-2
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,8 @@
143143

144144
- job:
145145
name: podified-multinode-hci-deployment-crc-3comp
146-
parent: podified-multinode-edpm-deployment-crc
146+
#parent: podified-multinode-edpm-deployment-crc-cloud
147+
parent: podified-multinode-edpm-deployment-crc-cloud
147148
nodeset: centos-9-medium-3x-centos-9-crc-extracted-2-39-0-xxl
148149
vars:
149150
cifmw_edpm_deploy_hci: true
@@ -310,9 +311,19 @@
310311
- cinder-operator
311312
cifmw_tempest_default_jobs: *tempest_tests_single_hci
312313

314+
#- job:
315+
# name: podified-multinode-edpm-deployment-crc
316+
# parent: cifmw-podified-multinode-edpm-base-crc
317+
# vars:
318+
# cifmw_extras:
319+
# - '@scenarios/centos-9/multinode-ci.yml'
320+
# - '@scenarios/centos-9/horizon.yml'
321+
# run:
322+
# - ci/playbooks/edpm/run.yml
323+
313324
- job:
314325
name: podified-multinode-edpm-deployment-crc
315-
parent: cifmw-podified-multinode-edpm-base-crc
326+
parent: cifmw-podified-multinode-edpm-base-crc-cloud
316327
vars:
317328
cifmw_extras:
318329
- '@scenarios/centos-9/multinode-ci.yml'
@@ -522,3 +533,27 @@
522533
</network>
523534
run:
524535
- ci/playbooks/edpm/run.yml
536+
537+
538+
### CRC CLOUD ###
539+
- job:
540+
name: podified-multinode-edpm-deployment-crc-cloud
541+
parent: cifmw-podified-multinode-edpm-base-crc-cloud
542+
vars:
543+
cifmw_extras:
544+
- '@scenarios/centos-9/multinode-ci.yml'
545+
- '@scenarios/centos-9/horizon.yml'
546+
run:
547+
- ci/playbooks/edpm/run.yml
548+
549+
- job:
550+
name: podified-multinode-edpm-update-crc-cloud
551+
parent: cifmw-podified-multinode-edpm-base-crc-cloud
552+
vars:
553+
cifmw_extras:
554+
- '@scenarios/centos-9/multinode-ci.yml'
555+
cifmw_run_update: true
556+
cifmw_run_tests: true
557+
run:
558+
- ci/playbooks/edpm/run.yml
559+
- ci/playbooks/edpm/update.yml

zuul.d/kuttl_multinode.yaml

+89-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
- job:
5353
name: cifmw-multinode-kuttl
54-
parent: cifmw-base-multinode-kuttl
54+
parent: cifmw-base-multinode-kuttl-crc-cloud
5555
timeout: 9000
5656
files:
5757
- ^ci/playbooks/kuttl/.*
@@ -85,3 +85,91 @@
8585
- ci/playbooks/kuttl/kuttl-from-operator-run.yaml
8686
vars:
8787
cifmw_target_host: controller
88+
89+
### CRC CLOUD ###
90+
- job:
91+
name: cifmw-base-multinode-kuttl-crc-cloud
92+
parent: cifmw-podified-multinode-edpm-base-crc-cloud
93+
timeout: 7200
94+
abstract: true
95+
nodeset: centos-9-medium-crc-cloud-ocp-4-18-1-3xl
96+
vars:
97+
zuul_log_collection: true
98+
extra-vars:
99+
crc_ci_bootstrap_cloud_name: "{{ nodepool.cloud | replace('-nodepool-tripleo','') }}"
100+
crc_ci_bootstrap_networking:
101+
networks:
102+
default:
103+
range: 192.168.122.0/24
104+
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
105+
router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}"
106+
internal-api:
107+
vlan: 20
108+
range: 172.17.0.0/24
109+
storage:
110+
vlan: 21
111+
range: 172.18.0.0/24
112+
tenant:
113+
vlan: 22
114+
range: 172.19.0.0/24
115+
instances:
116+
controller:
117+
networks:
118+
default:
119+
ip: 192.168.122.11
120+
crc:
121+
networks:
122+
default:
123+
ip: 192.168.122.10
124+
internal-api:
125+
ip: 172.17.0.5
126+
storage:
127+
ip: 172.18.0.5
128+
tenant:
129+
ip: 172.19.0.5
130+
pre-run:
131+
- ci/playbooks/e2e-prepare.yml
132+
run:
133+
- ci/playbooks/dump_zuul_data.yml
134+
- ci/playbooks/kuttl/run.yml
135+
post-run:
136+
- ci/playbooks/collect-logs.yml
137+
required-projects:
138+
- github.com/openstack-k8s-operators/install_yamls
139+
140+
- job:
141+
name: cifmw-multinode-kuttl-crc-cloud
142+
parent: cifmw-base-multinode-kuttl-crc-cloud
143+
timeout: 9000
144+
files:
145+
- ^ci/playbooks/kuttl/.*
146+
- ^scenarios/centos-9/kuttl.yml
147+
- ^zuul.d/kuttl.yaml
148+
vars:
149+
cifmw_extras:
150+
- '@scenarios/centos-9/kuttl_multinode.yml'
151+
cifmw_kuttl_tests_operator_list:
152+
- openstack
153+
- barbican
154+
- keystone
155+
- horizon
156+
commands_before_kuttl_run:
157+
- oc get pv
158+
- oc get all
159+
commands_after_kuttl_run:
160+
- oc get pv
161+
- oc get all
162+
163+
- job:
164+
name: cifmw-multinode-kuttl-operator-target-crc-cloud
165+
parent: cifmw-base-multinode-kuttl-crc-cloud
166+
description: |
167+
This job runs kuttl tests from the operator Make targets,
168+
without relying on install_yamls.
169+
dependencies: ["openstack-meta-content-provider"]
170+
pre-run:
171+
- ci/playbooks/kuttl/kuttl-from-operator-deps.yaml
172+
run:
173+
- ci/playbooks/kuttl/kuttl-from-operator-run.yaml
174+
vars:
175+
cifmw_target_host: controller

0 commit comments

Comments
 (0)