Skip to content

Commit 58643fd

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 58643fd

File tree

5 files changed

+40
-4
lines changed

5 files changed

+40
-4
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

+18-2
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,10 @@
122122
# crc_ci_bootstrap_networking using *extra-vars*.
123123
- job:
124124
name: cifmw-podified-multinode-edpm-base-crc
125-
parent: base-extracted-crc
125+
parent: base-crc-cloud
126126
timeout: 10800
127127
attempts: 1
128-
nodeset: centos-9-medium-centos-9-crc-extracted-2-39-0-3xl
128+
nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-16-3xl
129129
irrelevant-files: *ir_files
130130
required-projects: &multinode_edpm_rp
131131
- openstack-k8s-operators/ci-framework
@@ -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
@@ -306,3 +307,18 @@
306307
- ci/playbooks/e2e-prepare.yml
307308
- ci/playbooks/dump_zuul_data.yml
308309
- ci/playbooks/pre-ci-bootstrap.yml
310+
311+
- job:
312+
name: cifmw-podified-multinode-edpm-base-crc-cloud
313+
parent: base-crc-cloud
314+
timeout: 10800
315+
attempts: 1
316+
nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-16-3xl
317+
irrelevant-files: *ir_files
318+
required-projects: *multinode_edpm_rp
319+
roles: *multinode_edpm_roles
320+
pre-run: *multinode_edpm_pre_run
321+
post-run: *multinode_edpm_post_run
322+
vars:
323+
<<: *multinode_edpm_vars
324+
wait_for_mcp: true

zuul.d/edpm_multinode.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@
312312

313313
- job:
314314
name: podified-multinode-edpm-deployment-crc
315-
parent: cifmw-podified-multinode-edpm-base-crc
315+
parent: cifmw-podified-multinode-edpm-base-crc-cloud
316316
vars:
317317
cifmw_extras:
318318
- '@scenarios/centos-9/multinode-ci.yml'
@@ -334,6 +334,7 @@
334334
- job:
335335
name: podified-multinode-hci-deployment-crc
336336
parent: podified-multinode-hci-deployment-crc-3comp
337+
nodeset: centos-9-medium-3x-centos-9-crc-cloud-ocp-4-16-xxl
337338
vars:
338339
cifmw_extras:
339340
- '@scenarios/centos-9/multinode-ci.yml'

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-centos-9-crc-cloud-ocp-4-16-3xl
88
vars:
99
zuul_log_collection: true
1010
extra-vars:

zuul.d/nodeset.yaml

+17
Original file line numberDiff line numberDiff line change
@@ -279,3 +279,20 @@
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

0 commit comments

Comments
 (0)