Skip to content

Commit 929f1d2

Browse files
committed
DNM Checking CRC Cloud with image based on OCP 4.18-rc3
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 e6eb9e7 commit 929f1d2

7 files changed

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

zuul.d/edpm_multinode.yaml

+227-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-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-3xl
239331
vars:
240332
cifmw_edpm_deploy_hci: true
241333
cifmw_cephadm_single_host_defaults: true
@@ -313,9 +405,138 @@
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-3xl
411+
vars:
412+
cifmw_extras:
413+
- '@scenarios/centos-9/multinode-ci.yml'
414+
crc_ci_bootstrap_cloud_name: "{{ nodepool.cloud | replace('-nodepool-tripleo','') }}"
415+
crc_ci_bootstrap_networking:
416+
networks:
417+
default:
418+
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
419+
router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}"
420+
range: 192.168.122.0/24
421+
internal-api:
422+
vlan: 20
423+
range: 172.17.0.0/24
424+
storage:
425+
vlan: 21
426+
range: 172.18.0.0/24
427+
tenant:
428+
vlan: 22
429+
range: 172.19.0.0/24
430+
instances:
431+
controller:
432+
networks:
433+
default:
434+
ip: 192.168.122.11
435+
crc:
436+
networks:
437+
default:
438+
ip: 192.168.122.10
439+
internal-api:
440+
ip: 172.17.0.5
441+
storage:
442+
ip: 172.18.0.5
443+
tenant:
444+
ip: 172.19.0.5
445+
compute-0:
446+
networks:
447+
default:
448+
ip: 192.168.122.100
449+
internal-api:
450+
ip: 172.17.0.100
451+
config_nm: false
452+
storage:
453+
ip: 172.18.0.100
454+
config_nm: false
455+
tenant:
456+
ip: 172.19.0.100
457+
config_nm: false
458+
compute-1:
459+
networks:
460+
default:
461+
ip: 192.168.122.101
462+
internal-api:
463+
ip: 172.17.0.101
464+
config_nm: false
465+
storage:
466+
ip: 172.18.0.101
467+
config_nm: false
468+
tenant:
469+
ip: 172.19.0.101
470+
config_nm: false
471+
run:
472+
- ci/playbooks/edpm/run.yml
473+
474+
- job:
475+
name: podified-multinode-edpm-deployment-crc-cloud
476+
parent: base-crc-cloud
477+
timeout: 10800
478+
attempts: 1
479+
nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-18-3xl
316480
vars:
317481
cifmw_extras:
318482
- '@scenarios/centos-9/multinode-ci.yml'
483+
crc_ci_bootstrap_cloud_name: "{{ nodepool.cloud | replace('-nodepool-tripleo','') }}"
484+
crc_ci_bootstrap_networking:
485+
networks:
486+
default:
487+
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
488+
router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}"
489+
range: 192.168.122.0/24
490+
internal-api:
491+
vlan: 20
492+
range: 172.17.0.0/24
493+
storage:
494+
vlan: 21
495+
range: 172.18.0.0/24
496+
tenant:
497+
vlan: 22
498+
range: 172.19.0.0/24
499+
instances:
500+
controller:
501+
networks:
502+
default:
503+
ip: 192.168.122.11
504+
crc:
505+
networks:
506+
default:
507+
ip: 192.168.122.10
508+
internal-api:
509+
ip: 172.17.0.5
510+
storage:
511+
ip: 172.18.0.5
512+
tenant:
513+
ip: 172.19.0.5
514+
compute-0:
515+
networks:
516+
default:
517+
ip: 192.168.122.100
518+
internal-api:
519+
ip: 172.17.0.100
520+
config_nm: false
521+
storage:
522+
ip: 172.18.0.100
523+
config_nm: false
524+
tenant:
525+
ip: 172.19.0.100
526+
config_nm: false
527+
compute-1:
528+
networks:
529+
default:
530+
ip: 192.168.122.101
531+
internal-api:
532+
ip: 172.17.0.101
533+
config_nm: false
534+
storage:
535+
ip: 172.18.0.101
536+
config_nm: false
537+
tenant:
538+
ip: 172.19.0.101
539+
config_nm: false
319540
run:
320541
- ci/playbooks/edpm/run.yml
321542

@@ -331,9 +552,13 @@
331552
- ci/playbooks/edpm/run.yml
332553
- ci/playbooks/edpm/update.yml
333554

555+
556+
557+
558+
334559
- job:
335560
name: podified-multinode-hci-deployment-crc
336-
parent: podified-multinode-hci-deployment-crc-3comp
561+
parent: podified-multinode-hci-deployment-crc-3comp-crc-cloud
337562
vars:
338563
cifmw_extras:
339564
- '@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-3xl
88
vars:
99
zuul_log_collection: true
1010
extra-vars:

0 commit comments

Comments
 (0)