Skip to content

Commit 2882324

Browse files
committed
DNM Checking CRC Cloud with image based on OCP 4.16 rc4
This is early test PR that uses new way for deploying the CRC - crc-cloud [1] and image that is base on OCP 4.16 rc4 with small modifications [2]. In the future, that image would be created by the nodepool-builder, but right now it is just a PoC (Proof of concept). Also is worth to mention, that the base job includes few workarounds until the PR in the official projects are not merged [3][4][5] [1] https://github.com/crc-org/crc-cloud [2] https://softwarefactory-project.io/r/c/software-factory/sf-infra/+/31853 [3] crc-org/crc-cloud#188 [4] crc-org/crc-cloud#189 [5] crc-org/crc-cloud#190
1 parent 7498441 commit 2882324

6 files changed

+150
-3
lines changed

ci/playbooks/collect-logs.yml

+2
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@
119119
cp /etc/containers/registries.conf {{ ansible_user_dir }}/zuul-output/logs/
120120
cp -r /etc/containers/registries.conf.d {{ ansible_user_dir }}/zuul-output/logs/
121121
chown -R "{{ ansible_user }}" {{ ansible_user_dir }}/zuul-output/logs/registries.conf.d
122+
cp -r {{ ansible_user_dir }}/workdir/*log {{ ansible_user_dir }}/zuul-output/logs/crc-cloud/
123+
chown -R "{{ ansible_user }}" {{ ansible_user_dir }}/zuul-output/logs/crc-cloud/
122124
123125
- name: Copy generated documentation if available
124126
when:

zuul.d/base.yaml

+29
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@
147147
- ci/playbooks/collect-logs.yml
148148
- ci/playbooks/multinode-autohold.yml
149149
vars: &multinode_edpm_vars
150+
wait_for_mcp: true
150151
zuul_log_collection: true
151152
registry_login_enabled: true
152153
push_registry: quay.rdoproject.org
@@ -203,6 +204,19 @@
203204
tenant:
204205
ip: 172.19.0.100
205206
config_nm: false
207+
208+
- job:
209+
name: cifmw-podified-multinode-edpm-base-crc-cloud
210+
parent: base-crc-cloud
211+
timeout: 10800
212+
attempts: 1
213+
nodeset: centos-9-medium-centos-9-crc-extracted-2-39-0-3xl
214+
irrelevant-files: *ir_files
215+
required-projects: *multinode_edpm_rp
216+
roles: *multinode_edpm_roles
217+
pre-run: *multinode_edpm_pre_run
218+
post-run: *multinode_edpm_post_run
219+
vars: *multinode_edpm_vars
206220
#
207221
# Base jobs using ci-bootstrap layout
208222
#
@@ -306,3 +320,18 @@
306320
- ci/playbooks/e2e-prepare.yml
307321
- ci/playbooks/dump_zuul_data.yml
308322
- ci/playbooks/pre-ci-bootstrap.yml
323+
324+
- job:
325+
name: cifmw-podified-multinode-edpm-base-crc-cloud
326+
parent: base-crc-cloud
327+
timeout: 10800
328+
attempts: 1
329+
nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-16-3xl
330+
irrelevant-files: *ir_files
331+
required-projects: *multinode_edpm_rp
332+
roles: *multinode_edpm_roles
333+
pre-run: *multinode_edpm_pre_run
334+
post-run: *multinode_edpm_post_run
335+
vars:
336+
<<: *multinode_edpm_vars
337+
wait_for_mcp: true

zuul.d/edpm_multinode.yaml

+5-2
Original file line numberDiff line numberDiff line change
@@ -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-cloud-ocp-4-16-xxl
148148
vars:
149149
cifmw_edpm_deploy_hci: true
150150
crc_ci_bootstrap_cloud_name: "{{ nodepool.cloud | replace('-nodepool-tripleo','') }}"
@@ -312,7 +312,10 @@
312312

313313
- job:
314314
name: podified-multinode-edpm-deployment-crc
315-
parent: cifmw-podified-multinode-edpm-base-crc
315+
parent: base-crc-cloud
316+
timeout: 10800
317+
attempts: 1
318+
nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-16-3xl
316319
vars:
317320
cifmw_extras:
318321
- '@scenarios/centos-9/multinode-ci.yml'

zuul.d/kuttl_multinode.yaml

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

5252
- job:
5353
name: cifmw-multinode-kuttl
54-
parent: cifmw-base-multinode-kuttl
54+
parent: cifmw-base-multinode-kuttl-crc-cloud
55+
files:
56+
- ^ci/playbooks/kuttl/.*
57+
- ^scenarios/centos-9/kuttl.yml
58+
- ^zuul.d/kuttl.yaml
59+
vars:
60+
cifmw_extras:
61+
- '@scenarios/centos-9/kuttl_multinode.yml'
62+
cifmw_kuttl_tests_operator_list:
63+
- openstack
64+
- barbican
65+
- keystone
66+
- horizon
67+
commands_before_kuttl_run:
68+
- oc get pv
69+
- oc get all
70+
commands_after_kuttl_run:
71+
- oc get pv
72+
- oc get all
73+
74+
- job:
75+
name: cifmw-base-multinode-kuttl-crc-cloud
76+
parent: cifmw-podified-multinode-edpm-base-crc-cloud
77+
timeout: 7200
78+
abstract: true
79+
nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-16-3xl
80+
vars:
81+
zuul_log_collection: true
82+
extra-vars:
83+
crc_ci_bootstrap_cloud_name: "{{ nodepool.cloud | replace('-nodepool-tripleo','') }}"
84+
crc_ci_bootstrap_networking:
85+
networks:
86+
default:
87+
range: 192.168.122.0/24
88+
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
89+
router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}"
90+
internal-api:
91+
vlan: 20
92+
range: 172.17.0.0/24
93+
storage:
94+
vlan: 21
95+
range: 172.18.0.0/24
96+
tenant:
97+
vlan: 22
98+
range: 172.19.0.0/24
99+
instances:
100+
controller:
101+
networks:
102+
default:
103+
ip: 192.168.122.11
104+
crc:
105+
networks:
106+
default:
107+
ip: 192.168.122.10
108+
internal-api:
109+
ip: 172.17.0.5
110+
storage:
111+
ip: 172.18.0.5
112+
tenant:
113+
ip: 172.19.0.5
114+
pre-run:
115+
- ci/playbooks/e2e-prepare.yml
116+
run:
117+
- ci/playbooks/dump_zuul_data.yml
118+
- ci/playbooks/kuttl/run.yml
119+
post-run:
120+
- ci/playbooks/collect-logs.yml
121+
required-projects:
122+
- github.com/openstack-k8s-operators/install_yamls
123+
124+
- job:
125+
name: cifmw-multinode-kuttl
126+
parent: cifmw-base-multinode-kuttl-crc-cloud
55127
files:
56128
- ^ci/playbooks/kuttl/.*
57129
- ^scenarios/centos-9/kuttl.yml

zuul.d/nodeset.yaml

+40
Original file line numberDiff line numberDiff line change
@@ -279,3 +279,43 @@
279279
nodes:
280280
- name: controller
281281
label: centos-9-stream-crc-2-39-0-xl
282+
283+
- nodeset:
284+
name: centos-9-medium-centos-9-crc-cloud-ocp-4-16-3xl
285+
nodes:
286+
- name: controller
287+
label: cloud-centos-9-stream-tripleo-medium
288+
- name: compute-0
289+
label: cloud-centos-9-stream-tripleo
290+
- name: crc
291+
label: crc-cloud-ocp-4-16-0-3xl
292+
groups:
293+
- name: computes
294+
nodes:
295+
- compute-0
296+
- name: ocps
297+
nodes:
298+
- crc
299+
300+
- nodeset:
301+
name: centos-9-medium-3x-centos-9-crc-cloud-ocp-4-16-xxl
302+
nodes:
303+
- name: controller
304+
label: cloud-centos-9-stream-tripleo-medium
305+
- name: compute-0
306+
label: cloud-centos-9-stream-tripleo
307+
- name: compute-1
308+
label: cloud-centos-9-stream-tripleo
309+
- name: compute-2
310+
label: cloud-centos-9-stream-tripleo
311+
- name: crc
312+
label: crc-cloud-ocp-4-16-0-3xl
313+
groups:
314+
- name: computes
315+
nodes:
316+
- compute-0
317+
- compute-1
318+
- compute-2
319+
- name: ocps
320+
nodes:
321+
- crc

zuul.d/tempest_multinode.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@
117117
- job:
118118
name: cifmw-multinode-tempest
119119
parent: podified-multinode-edpm-deployment-crc-tempest
120+
nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-16-3xl
120121
files:
121122
- ^roles/test_operator
122123
- ^scenarios/centos-9/multinode-ci.yml

0 commit comments

Comments
 (0)