Skip to content

Commit b312d1b

Browse files
danpawlikdanpawlik
committed
Replacing crc extracted jobs with crc-cloud
The CRC cloud would be used in the future and will replace the crc extracted images.
1 parent 3dc53b6 commit b312d1b

6 files changed

+584
-0
lines changed

‎zuul.d/base.yaml

+86
Original file line numberDiff line numberDiff line change
@@ -309,3 +309,89 @@
309309
- ci/playbooks/e2e-prepare.yml
310310
- ci/playbooks/dump_zuul_data.yml
311311
- ci/playbooks/bootstrap-networking-mapper.yml
312+
313+
314+
######## CRC CLOUD ##########
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+
- openstack-k8s-operators/ci-framework
324+
- openstack-k8s-operators/install_yamls
325+
- openstack-k8s-operators/infra-operator
326+
- openstack-k8s-operators/openstack-baremetal-operator
327+
- openstack-k8s-operators/openstack-must-gather
328+
- openstack-k8s-operators/openstack-operator
329+
- openstack-k8s-operators/repo-setup
330+
- openstack-k8s-operators/edpm-ansible
331+
roles: &multinode_edpm_roles
332+
- zuul: github.com/openstack-k8s-operators/ci-framework
333+
pre-run: &multinode_edpm_pre_run
334+
- ci/playbooks/multinode-customizations.yml
335+
- ci/playbooks/e2e-prepare.yml
336+
- ci/playbooks/dump_zuul_data.yml
337+
post-run: &multinode_edpm_post_run
338+
- ci/playbooks/e2e-collect-logs.yml
339+
- ci/playbooks/collect-logs.yml
340+
- ci/playbooks/multinode-autohold.yml
341+
vars: &multinode_edpm_vars
342+
zuul_log_collection: true
343+
registry_login_enabled: true
344+
push_registry: quay.rdoproject.org
345+
quay_login_secret_name: quay_nextgen_zuulgithubci
346+
cifmw_artifacts_crc_sshkey: "~/.ssh/id_cifw"
347+
cifmw_openshift_user: kubeadmin
348+
cifmw_openshift_password: "123456789"
349+
cifmw_openshift_api: api.crc.testing:6443
350+
cifmw_openshift_kubeconfig: "{{ ansible_user_dir }}/.crc/machines/crc/kubeconfig"
351+
cifmw_openshift_skip_tls_verify: true
352+
cifmw_use_libvirt: false
353+
cifmw_zuul_target_host: controller
354+
crc_ci_bootstrap_cloud_name: "{{ nodepool.cloud | replace('-nodepool-tripleo','') }}"
355+
crc_ci_bootstrap_networking:
356+
networks:
357+
default:
358+
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
359+
router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}"
360+
range: 192.168.122.0/24
361+
internal-api:
362+
vlan: 20
363+
range: 172.17.0.0/24
364+
storage:
365+
vlan: 21
366+
range: 172.18.0.0/24
367+
tenant:
368+
vlan: 22
369+
range: 172.19.0.0/24
370+
instances:
371+
controller:
372+
networks:
373+
default:
374+
ip: 192.168.122.11
375+
crc:
376+
networks:
377+
default:
378+
ip: 192.168.122.10
379+
internal-api:
380+
ip: 172.17.0.5
381+
storage:
382+
ip: 172.18.0.5
383+
tenant:
384+
ip: 172.19.0.5
385+
compute-0:
386+
networks:
387+
default:
388+
ip: 192.168.122.100
389+
internal-api:
390+
ip: 172.17.0.100
391+
config_nm: false
392+
storage:
393+
ip: 172.18.0.100
394+
config_nm: false
395+
tenant:
396+
ip: 172.19.0.100
397+
config_nm: false

‎zuul.d/edpm_multinode.yaml

+24
Original file line numberDiff line numberDiff line change
@@ -522,3 +522,27 @@
522522
</network>
523523
run:
524524
- ci/playbooks/edpm/run.yml
525+
526+
527+
### CRC CLOUD ###
528+
- job:
529+
name: podified-multinode-edpm-deployment-crc-cloud
530+
parent: cifmw-podified-multinode-edpm-base-crc-cloud
531+
vars:
532+
cifmw_extras:
533+
- '@scenarios/centos-9/multinode-ci.yml'
534+
- '@scenarios/centos-9/horizon.yml'
535+
run:
536+
- ci/playbooks/edpm/run.yml
537+
538+
- job:
539+
name: podified-multinode-edpm-update-crc-cloud
540+
parent: cifmw-podified-multinode-edpm-base-crc-cloud
541+
vars:
542+
cifmw_extras:
543+
- '@scenarios/centos-9/multinode-ci.yml'
544+
cifmw_run_update: true
545+
cifmw_run_tests: true
546+
run:
547+
- ci/playbooks/edpm/run.yml
548+
- ci/playbooks/edpm/update.yml

‎zuul.d/kuttl_multinode.yaml

+88
Original file line numberDiff line numberDiff line change
@@ -85,3 +85,91 @@
8585
- ci/playbooks/kuttl/kuttl-from-operator-run.yaml
8686
vars:
8787
cifmw_target_host: controller
88+
89+
### CRC CLOUD ###
90+
- job:
91+
name: cifmw-base-multinode-kuttl-crc-cloud
92+
parent: cifmw-podified-multinode-edpm-base-crc-cloud
93+
timeout: 7200
94+
abstract: true
95+
nodeset: centos-9-medium-crc-cloud-ocp-4-18-1-3xl
96+
vars:
97+
zuul_log_collection: true
98+
extra-vars:
99+
crc_ci_bootstrap_cloud_name: "{{ nodepool.cloud | replace('-nodepool-tripleo','') }}"
100+
crc_ci_bootstrap_networking:
101+
networks:
102+
default:
103+
range: 192.168.122.0/24
104+
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
105+
router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}"
106+
internal-api:
107+
vlan: 20
108+
range: 172.17.0.0/24
109+
storage:
110+
vlan: 21
111+
range: 172.18.0.0/24
112+
tenant:
113+
vlan: 22
114+
range: 172.19.0.0/24
115+
instances:
116+
controller:
117+
networks:
118+
default:
119+
ip: 192.168.122.11
120+
crc:
121+
networks:
122+
default:
123+
ip: 192.168.122.10
124+
internal-api:
125+
ip: 172.17.0.5
126+
storage:
127+
ip: 172.18.0.5
128+
tenant:
129+
ip: 172.19.0.5
130+
pre-run:
131+
- ci/playbooks/e2e-prepare.yml
132+
run:
133+
- ci/playbooks/dump_zuul_data.yml
134+
- ci/playbooks/kuttl/run.yml
135+
post-run:
136+
- ci/playbooks/collect-logs.yml
137+
required-projects:
138+
- github.com/openstack-k8s-operators/install_yamls
139+
140+
- job:
141+
name: cifmw-multinode-kuttl-crc-cloud
142+
parent: cifmw-base-multinode-kuttl-crc-cloud
143+
timeout: 9000
144+
files:
145+
- ^ci/playbooks/kuttl/.*
146+
- ^scenarios/centos-9/kuttl.yml
147+
- ^zuul.d/kuttl.yaml
148+
vars:
149+
cifmw_extras:
150+
- '@scenarios/centos-9/kuttl_multinode.yml'
151+
cifmw_kuttl_tests_operator_list:
152+
- openstack
153+
- barbican
154+
- keystone
155+
- horizon
156+
commands_before_kuttl_run:
157+
- oc get pv
158+
- oc get all
159+
commands_after_kuttl_run:
160+
- oc get pv
161+
- oc get all
162+
163+
- job:
164+
name: cifmw-multinode-kuttl-operator-target-crc-cloud
165+
parent: cifmw-base-multinode-kuttl-crc-cloud
166+
description: |
167+
This job runs kuttl tests from the operator Make targets,
168+
without relying on install_yamls.
169+
dependencies: ["openstack-meta-content-provider"]
170+
pre-run:
171+
- ci/playbooks/kuttl/kuttl-from-operator-deps.yaml
172+
run:
173+
- ci/playbooks/kuttl/kuttl-from-operator-run.yaml
174+
vars:
175+
cifmw_target_host: controller

0 commit comments

Comments
 (0)