Skip to content

Commit 2f3040f

Browse files
committed
DNM Checking CRC Cloud with image based on OCP 4.18-rc7
This is early test PR that uses new way for deploying the CRC - crc-cloud [1] and image that is base on OCP 4.18. 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 21a8cd5 commit 2f3040f

7 files changed

+381
-8
lines changed

ci/playbooks/collect-logs.yml

+2
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

+73
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@
148148
- ci/playbooks/collect-logs.yml
149149
- ci/playbooks/multinode-autohold.yml
150150
vars: &multinode_edpm_vars
151+
wait_for_mcp: false
151152
zuul_log_collection: true
152153
registry_login_enabled: true
153154
push_registry: quay.rdoproject.org
@@ -204,6 +205,7 @@
204205
tenant:
205206
ip: 172.19.0.100
206207
config_nm: false
208+
207209
#
208210
# Base jobs using ci-bootstrap layout
209211
#
@@ -309,3 +311,74 @@
309311
- ci/playbooks/e2e-prepare.yml
310312
- ci/playbooks/dump_zuul_data.yml
311313
- ci/playbooks/bootstrap-networking-mapper.yml
314+
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:
327+
<<: *multinode_edpm_vars
328+
wait_for_mcp: false
329+
zuul_log_collection: true
330+
registry_login_enabled: true
331+
push_registry: quay.rdoproject.org
332+
quay_login_secret_name: quay_nextgen_zuulgithubci
333+
cifmw_artifacts_crc_sshkey: "~/.ssh/id_cifw"
334+
cifmw_openshift_user: kubeadmin
335+
cifmw_openshift_password: "123456789"
336+
cifmw_openshift_api: api.crc.testing:6443
337+
cifmw_openshift_kubeconfig: "{{ ansible_user_dir }}/.crc/machines/crc/kubeconfig"
338+
cifmw_openshift_skip_tls_verify: true
339+
cifmw_use_libvirt: false
340+
cifmw_zuul_target_host: controller
341+
crc_ci_bootstrap_cloud_name: "{{ nodepool.cloud | replace('-nodepool-tripleo','') }}"
342+
crc_ci_bootstrap_networking:
343+
networks:
344+
default:
345+
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
346+
router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}"
347+
range: 192.168.122.0/24
348+
internal-api:
349+
vlan: 20
350+
range: 172.17.0.0/24
351+
storage:
352+
vlan: 21
353+
range: 172.18.0.0/24
354+
tenant:
355+
vlan: 22
356+
range: 172.19.0.0/24
357+
instances:
358+
controller:
359+
networks:
360+
default:
361+
ip: 192.168.122.11
362+
crc:
363+
networks:
364+
default:
365+
ip: 192.168.122.10
366+
internal-api:
367+
ip: 172.17.0.5
368+
storage:
369+
ip: 172.18.0.5
370+
tenant:
371+
ip: 172.19.0.5
372+
compute-0:
373+
networks:
374+
default:
375+
ip: 192.168.122.100
376+
internal-api:
377+
ip: 172.17.0.100
378+
config_nm: false
379+
storage:
380+
ip: 172.18.0.100
381+
config_nm: false
382+
tenant:
383+
ip: 172.19.0.100
384+
config_nm: false

zuul.d/edpm_multinode.yaml

+228-2
Original file line numberDiff line numberDiff line change
@@ -232,10 +232,102 @@
232232
ip: 172.20.0.102
233233
config_nm: false
234234

235+
236+
- job:
237+
name: podified-multinode-hci-deployment-crc-3comp-crc-cloud
238+
parent: podified-multinode-edpm-deployment-crc-cloud
239+
nodeset: centos-9-medium-3x-centos-9-crc-cloud-ocp-4-18-1-xxl
240+
vars:
241+
cifmw_edpm_deploy_hci: true
242+
crc_ci_bootstrap_cloud_name: "{{ nodepool.cloud | replace('-nodepool-tripleo','') }}"
243+
crc_ci_bootstrap_networking:
244+
networks:
245+
default:
246+
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
247+
router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}"
248+
range: 192.168.122.0/24
249+
internal-api:
250+
vlan: 20
251+
range: 172.17.0.0/24
252+
storage:
253+
vlan: 21
254+
range: 172.18.0.0/24
255+
tenant:
256+
vlan: 22
257+
range: 172.19.0.0/24
258+
storage-mgmt:
259+
vlan: 23
260+
range: 172.20.0.0/24
261+
instances:
262+
controller:
263+
networks:
264+
default:
265+
ip: 192.168.122.11
266+
crc:
267+
networks:
268+
default:
269+
ip: 192.168.122.10
270+
internal-api:
271+
ip: 172.17.0.5
272+
storage:
273+
ip: 172.18.0.5
274+
tenant:
275+
ip: 172.19.0.5
276+
storage-mgmt:
277+
ip: 172.20.0.5
278+
compute-0:
279+
networks:
280+
default:
281+
ip: 192.168.122.100
282+
internal-api:
283+
ip: 172.17.0.100
284+
config_nm: false
285+
storage:
286+
ip: 172.18.0.100
287+
config_nm: false
288+
tenant:
289+
ip: 172.19.0.100
290+
config_nm: false
291+
storage-mgmt:
292+
ip: 172.20.0.100
293+
config_nm: false
294+
compute-1:
295+
networks:
296+
default:
297+
ip: 192.168.122.101
298+
internal-api:
299+
ip: 172.17.0.101
300+
config_nm: false
301+
storage:
302+
ip: 172.18.0.101
303+
config_nm: false
304+
tenant:
305+
ip: 172.19.0.101
306+
config_nm: false
307+
storage-mgmt:
308+
ip: 172.20.0.101
309+
config_nm: false
310+
compute-2:
311+
networks:
312+
default:
313+
ip: 192.168.122.102
314+
internal-api:
315+
ip: 172.17.0.102
316+
config_nm: false
317+
storage:
318+
ip: 172.18.0.102
319+
config_nm: false
320+
tenant:
321+
ip: 172.19.0.102
322+
config_nm: false
323+
storage-mgmt:
324+
ip: 172.20.0.102
325+
config_nm: false
326+
235327
- job:
236328
name: podified-multinode-hci-deployment-crc-1comp
237329
parent: podified-multinode-edpm-deployment-crc
238-
nodeset: centos-9-medium-centos-9-crc-extracted-2-39-0-3xl
330+
nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-18-1-3xl
239331
vars:
240332
cifmw_edpm_deploy_hci: true
241333
cifmw_cephadm_single_host_defaults: true
@@ -313,10 +405,140 @@
313405
- job:
314406
name: podified-multinode-edpm-deployment-crc
315407
parent: cifmw-podified-multinode-edpm-base-crc
408+
timeout: 10800
409+
attempts: 1
410+
nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-18-1-3xl
316411
vars:
317412
cifmw_extras:
318413
- '@scenarios/centos-9/multinode-ci.yml'
319414
- '@scenarios/centos-9/horizon.yml'
415+
crc_ci_bootstrap_cloud_name: "{{ nodepool.cloud | replace('-nodepool-tripleo','') }}"
416+
crc_ci_bootstrap_networking:
417+
networks:
418+
default:
419+
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
420+
router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}"
421+
range: 192.168.122.0/24
422+
internal-api:
423+
vlan: 20
424+
range: 172.17.0.0/24
425+
storage:
426+
vlan: 21
427+
range: 172.18.0.0/24
428+
tenant:
429+
vlan: 22
430+
range: 172.19.0.0/24
431+
instances:
432+
controller:
433+
networks:
434+
default:
435+
ip: 192.168.122.11
436+
crc:
437+
networks:
438+
default:
439+
ip: 192.168.122.10
440+
internal-api:
441+
ip: 172.17.0.5
442+
storage:
443+
ip: 172.18.0.5
444+
tenant:
445+
ip: 172.19.0.5
446+
compute-0:
447+
networks:
448+
default:
449+
ip: 192.168.122.100
450+
internal-api:
451+
ip: 172.17.0.100
452+
config_nm: false
453+
storage:
454+
ip: 172.18.0.100
455+
config_nm: false
456+
tenant:
457+
ip: 172.19.0.100
458+
config_nm: false
459+
compute-1:
460+
networks:
461+
default:
462+
ip: 192.168.122.101
463+
internal-api:
464+
ip: 172.17.0.101
465+
config_nm: false
466+
storage:
467+
ip: 172.18.0.101
468+
config_nm: false
469+
tenant:
470+
ip: 172.19.0.101
471+
config_nm: false
472+
run:
473+
- ci/playbooks/edpm/run.yml
474+
475+
- job:
476+
name: podified-multinode-edpm-deployment-crc-cloud
477+
parent: base-crc-cloud
478+
timeout: 10800
479+
attempts: 1
480+
nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-18-1-3xl
481+
vars:
482+
cifmw_extras:
483+
- '@scenarios/centos-9/multinode-ci.yml'
484+
- '@scenarios/centos-9/horizon.yml'
485+
crc_ci_bootstrap_cloud_name: "{{ nodepool.cloud | replace('-nodepool-tripleo','') }}"
486+
crc_ci_bootstrap_networking:
487+
networks:
488+
default:
489+
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
490+
router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}"
491+
range: 192.168.122.0/24
492+
internal-api:
493+
vlan: 20
494+
range: 172.17.0.0/24
495+
storage:
496+
vlan: 21
497+
range: 172.18.0.0/24
498+
tenant:
499+
vlan: 22
500+
range: 172.19.0.0/24
501+
instances:
502+
controller:
503+
networks:
504+
default:
505+
ip: 192.168.122.11
506+
crc:
507+
networks:
508+
default:
509+
ip: 192.168.122.10
510+
internal-api:
511+
ip: 172.17.0.5
512+
storage:
513+
ip: 172.18.0.5
514+
tenant:
515+
ip: 172.19.0.5
516+
compute-0:
517+
networks:
518+
default:
519+
ip: 192.168.122.100
520+
internal-api:
521+
ip: 172.17.0.100
522+
config_nm: false
523+
storage:
524+
ip: 172.18.0.100
525+
config_nm: false
526+
tenant:
527+
ip: 172.19.0.100
528+
config_nm: false
529+
compute-1:
530+
networks:
531+
default:
532+
ip: 192.168.122.101
533+
internal-api:
534+
ip: 172.17.0.101
535+
config_nm: false
536+
storage:
537+
ip: 172.18.0.101
538+
config_nm: false
539+
tenant:
540+
ip: 172.19.0.101
541+
config_nm: false
320542
run:
321543
- ci/playbooks/edpm/run.yml
322544

@@ -332,9 +554,13 @@
332554
- ci/playbooks/edpm/run.yml
333555
- ci/playbooks/edpm/update.yml
334556

557+
558+
559+
560+
335561
- job:
336562
name: podified-multinode-hci-deployment-crc
337-
parent: podified-multinode-hci-deployment-crc-3comp
563+
parent: podified-multinode-hci-deployment-crc-3comp-crc-cloud
338564
vars:
339565
cifmw_extras:
340566
- '@scenarios/centos-9/multinode-ci.yml'

zuul.d/kuttl_multinode.yaml

+2-2
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-18-1-3xl
88
vars:
99
zuul_log_collection: true
1010
extra-vars:

0 commit comments

Comments
 (0)