Skip to content

Commit bfb5ac1

Browse files
committed
DNM Checking CRC Cloud with image based on OCP 4.16.4
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. 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 8d239cf commit bfb5ac1

File tree

7 files changed

+128
-9
lines changed

7 files changed

+128
-9
lines changed

ci/playbooks/collect-logs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@
121121
cp /etc/containers/registries.conf {{ ansible_user_dir }}/zuul-output/logs/
122122
cp -r /etc/containers/registries.conf.d {{ ansible_user_dir }}/zuul-output/logs/
123123
chown -R "{{ ansible_user }}" {{ ansible_user_dir }}/zuul-output/logs/registries.conf.d
124+
cp -r {{ ansible_user_dir }}/workdir/*log {{ ansible_user_dir }}/zuul-output/logs/crc-cloud/
125+
chown -R "{{ ansible_user }}" {{ ansible_user_dir }}/zuul-output/logs/crc-cloud/
124126
125127
- name: Copy generated documentation if available
126128
when:

zuul.d/base.yaml

Lines changed: 73 additions & 0 deletions
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: false
150151
zuul_log_collection: true
151152
registry_login_enabled: true
152153
push_registry: quay.rdoproject.org
@@ -203,6 +204,7 @@
203204
tenant:
204205
ip: 172.19.0.100
205206
config_nm: false
207+
206208
#
207209
# Base jobs using ci-bootstrap layout
208210
#
@@ -306,3 +308,74 @@
306308
- ci/playbooks/e2e-prepare.yml
307309
- ci/playbooks/dump_zuul_data.yml
308310
- ci/playbooks/pre-ci-bootstrap.yml
311+
312+
- job:
313+
name: cifmw-podified-multinode-edpm-base-crc-cloud
314+
parent: base-crc-cloud
315+
timeout: 10800
316+
attempts: 1
317+
nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-16-3xl
318+
irrelevant-files: *ir_files
319+
required-projects: *multinode_edpm_rp
320+
roles: *multinode_edpm_roles
321+
pre-run: *multinode_edpm_pre_run
322+
post-run: *multinode_edpm_post_run
323+
vars:
324+
<<: *multinode_edpm_vars
325+
wait_for_mcp: false
326+
zuul_log_collection: true
327+
registry_login_enabled: true
328+
push_registry: quay.rdoproject.org
329+
quay_login_secret_name: quay_nextgen_zuulgithubci
330+
cifmw_artifacts_crc_sshkey: "~/.ssh/id_cifw"
331+
cifmw_openshift_user: kubeadmin
332+
cifmw_openshift_password: "123456789"
333+
cifmw_openshift_api: api.crc.testing:6443
334+
cifmw_openshift_kubeconfig: "{{ ansible_user_dir }}/.crc/machines/crc/kubeconfig"
335+
cifmw_openshift_skip_tls_verify: true
336+
cifmw_use_libvirt: false
337+
cifmw_zuul_target_host: controller
338+
crc_ci_bootstrap_cloud_name: "{{ nodepool.cloud | replace('-nodepool-tripleo','') }}"
339+
crc_ci_bootstrap_networking:
340+
networks:
341+
default:
342+
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
343+
router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}"
344+
range: 192.168.122.0/24
345+
internal-api:
346+
vlan: 20
347+
range: 172.17.0.0/24
348+
storage:
349+
vlan: 21
350+
range: 172.18.0.0/24
351+
tenant:
352+
vlan: 22
353+
range: 172.19.0.0/24
354+
instances:
355+
controller:
356+
networks:
357+
default:
358+
ip: 192.168.122.11
359+
crc:
360+
networks:
361+
default:
362+
ip: 192.168.122.10
363+
internal-api:
364+
ip: 172.17.0.5
365+
storage:
366+
ip: 172.18.0.5
367+
tenant:
368+
ip: 172.19.0.5
369+
compute-0:
370+
networks:
371+
default:
372+
ip: 192.168.122.100
373+
internal-api:
374+
ip: 172.17.0.100
375+
config_nm: false
376+
storage:
377+
ip: 172.18.0.100
378+
config_nm: false
379+
tenant:
380+
ip: 172.19.0.100
381+
config_nm: false

zuul.d/edpm_multinode.yaml

Lines changed: 6 additions & 3 deletions
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','') }}"
@@ -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-cloud-ocp-4-16-3xl
239239
vars:
240240
cifmw_edpm_deploy_hci: true
241241
cifmw_cephadm_single_host_defaults: true
@@ -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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
- job:
33
name: cifmw-base-multinode-kuttl
4-
parent: cifmw-podified-multinode-edpm-base-crc
4+
parent: cifmw-podified-multinode-edpm-base-crc-cloud
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

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,3 +325,43 @@
325325
nodes:
326326
- name: controller
327327
label: centos-9-stream-crc-2-39-0-xl
328+
329+
- nodeset:
330+
name: centos-9-medium-centos-9-crc-cloud-ocp-4-16-3xl
331+
nodes:
332+
- name: controller
333+
label: cloud-centos-9-stream-tripleo-medium
334+
- name: compute-0
335+
label: cloud-centos-9-stream-tripleo
336+
- name: crc
337+
label: crc-cloud-ocp-4-16-4-3xl
338+
groups:
339+
- name: computes
340+
nodes:
341+
- compute-0
342+
- name: ocps
343+
nodes:
344+
- crc
345+
346+
- nodeset:
347+
name: centos-9-medium-3x-centos-9-crc-cloud-ocp-4-16-xxl
348+
nodes:
349+
- name: controller
350+
label: cloud-centos-9-stream-tripleo-medium
351+
- name: compute-0
352+
label: cloud-centos-9-stream-tripleo
353+
- name: compute-1
354+
label: cloud-centos-9-stream-tripleo
355+
- name: compute-2
356+
label: cloud-centos-9-stream-tripleo
357+
- name: crc
358+
label: crc-cloud-ocp-4-16-0-3xl
359+
groups:
360+
- name: computes
361+
nodes:
362+
- compute-0
363+
- compute-1
364+
- compute-2
365+
- name: ocps
366+
nodes:
367+
- crc

zuul.d/podified_multinode.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

1010
- job:
1111
name: cifmw-base-multinode-podified
12-
parent: cifmw-podified-multinode-edpm-base-crc
12+
parent: cifmw-podified-multinode-edpm-base-crc-cloud
1313
timeout: 5400
1414
abstract: true
15-
nodeset: centos-9-medium-crc-extracted-2-39-0-3xl
15+
nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-16-3xl
1616
run:
1717
- ci/playbooks/edpm/run.yml
1818
extra-vars:

zuul.d/tempest_multinode.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
- job:
33
name: cifmw-base-multinode-tempest
4-
parent: cifmw-podified-multinode-edpm-base-crc
4+
parent: cifmw-podified-multinode-edpm-base-crc-cloud
55
timeout: 5400
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
description: |
99
Base multinode job definition for running test-operator.
1010
vars:
@@ -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)