Skip to content

Commit

Permalink
DNM Checking CRC Cloud with image based on OCP 4.16.4
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@danpawlik
danpawlik committed Oct 18, 2024
1 parent bff7cfb commit adfaa01
Show file tree
Hide file tree
Showing 7 changed files with 380 additions and 8 deletions.
2 changes: 2 additions & 0 deletions ci/playbooks/collect-logs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@
cp /etc/containers/registries.conf {{ ansible_user_dir }}/zuul-output/logs/
cp -r /etc/containers/registries.conf.d {{ ansible_user_dir }}/zuul-output/logs/
chown -R "{{ ansible_user }}" {{ ansible_user_dir }}/zuul-output/logs/registries.conf.d
cp -r {{ ansible_user_dir }}/workdir/*log {{ ansible_user_dir }}/zuul-output/logs/crc-cloud/
chown -R "{{ ansible_user }}" {{ ansible_user_dir }}/zuul-output/logs/crc-cloud/
- name: Copy generated documentation if available
when:
Expand Down
73 changes: 73 additions & 0 deletions zuul.d/base.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@
- ci/playbooks/collect-logs.yml
- ci/playbooks/multinode-autohold.yml
vars: &multinode_edpm_vars
wait_for_mcp: false
zuul_log_collection: true
registry_login_enabled: true
push_registry: quay.rdoproject.org
Expand Down Expand Up @@ -204,6 +205,7 @@
tenant:
ip: 172.19.0.100
config_nm: false

#
# Base jobs using ci-bootstrap layout
#
Expand Down Expand Up @@ -309,3 +311,74 @@
- ci/playbooks/e2e-prepare.yml
- ci/playbooks/dump_zuul_data.yml
- ci/playbooks/bootstrap-networking-mapper.yml

- job:
name: cifmw-podified-multinode-edpm-base-crc-cloud
parent: base-crc-cloud
timeout: 10800
attempts: 1
nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-16-3xl
irrelevant-files: *ir_files
required-projects: *multinode_edpm_rp
roles: *multinode_edpm_roles
pre-run: *multinode_edpm_pre_run
post-run: *multinode_edpm_post_run
vars:
<<: *multinode_edpm_vars
wait_for_mcp: false
zuul_log_collection: true
registry_login_enabled: true
push_registry: quay.rdoproject.org
quay_login_secret_name: quay_nextgen_zuulgithubci
cifmw_artifacts_crc_sshkey: "~/.ssh/id_cifw"
cifmw_openshift_user: kubeadmin
cifmw_openshift_password: "123456789"
cifmw_openshift_api: api.crc.testing:6443
cifmw_openshift_kubeconfig: "{{ ansible_user_dir }}/.crc/machines/crc/kubeconfig"
cifmw_openshift_skip_tls_verify: true
cifmw_use_libvirt: false
cifmw_zuul_target_host: controller
crc_ci_bootstrap_cloud_name: "{{ nodepool.cloud | replace('-nodepool-tripleo','') }}"
crc_ci_bootstrap_networking:
networks:
default:
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}"
range: 192.168.122.0/24
internal-api:
vlan: 20
range: 172.17.0.0/24
storage:
vlan: 21
range: 172.18.0.0/24
tenant:
vlan: 22
range: 172.19.0.0/24
instances:
controller:
networks:
default:
ip: 192.168.122.11
crc:
networks:
default:
ip: 192.168.122.10
internal-api:
ip: 172.17.0.5
storage:
ip: 172.18.0.5
tenant:
ip: 172.19.0.5
compute-0:
networks:
default:
ip: 192.168.122.100
internal-api:
ip: 172.17.0.100
config_nm: false
storage:
ip: 172.18.0.100
config_nm: false
tenant:
ip: 172.19.0.100
config_nm: false
229 changes: 227 additions & 2 deletions zuul.d/edpm_multinode.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,10 +232,102 @@
ip: 172.20.0.102
config_nm: false


- job:
name: podified-multinode-hci-deployment-crc-3comp-crc-cloud
parent: podified-multinode-edpm-deployment-crc-cloud
nodeset: centos-9-medium-3x-centos-9-crc-cloud-ocp-4-16-xxl
vars:
cifmw_edpm_deploy_hci: true
crc_ci_bootstrap_cloud_name: "{{ nodepool.cloud | replace('-nodepool-tripleo','') }}"
crc_ci_bootstrap_networking:
networks:
default:
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}"
range: 192.168.122.0/24
internal-api:
vlan: 20
range: 172.17.0.0/24
storage:
vlan: 21
range: 172.18.0.0/24
tenant:
vlan: 22
range: 172.19.0.0/24
storage-mgmt:
vlan: 23
range: 172.20.0.0/24
instances:
controller:
networks:
default:
ip: 192.168.122.11
crc:
networks:
default:
ip: 192.168.122.10
internal-api:
ip: 172.17.0.5
storage:
ip: 172.18.0.5
tenant:
ip: 172.19.0.5
storage-mgmt:
ip: 172.20.0.5
compute-0:
networks:
default:
ip: 192.168.122.100
internal-api:
ip: 172.17.0.100
config_nm: false
storage:
ip: 172.18.0.100
config_nm: false
tenant:
ip: 172.19.0.100
config_nm: false
storage-mgmt:
ip: 172.20.0.100
config_nm: false
compute-1:
networks:
default:
ip: 192.168.122.101
internal-api:
ip: 172.17.0.101
config_nm: false
storage:
ip: 172.18.0.101
config_nm: false
tenant:
ip: 172.19.0.101
config_nm: false
storage-mgmt:
ip: 172.20.0.101
config_nm: false
compute-2:
networks:
default:
ip: 192.168.122.102
internal-api:
ip: 172.17.0.102
config_nm: false
storage:
ip: 172.18.0.102
config_nm: false
tenant:
ip: 172.19.0.102
config_nm: false
storage-mgmt:
ip: 172.20.0.102
config_nm: false

- job:
name: podified-multinode-hci-deployment-crc-1comp
parent: podified-multinode-edpm-deployment-crc
nodeset: centos-9-medium-centos-9-crc-extracted-2-39-0-3xl
nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-16-3xl
vars:
cifmw_edpm_deploy_hci: true
cifmw_cephadm_single_host_defaults: true
Expand Down Expand Up @@ -313,9 +405,138 @@
- job:
name: podified-multinode-edpm-deployment-crc
parent: cifmw-podified-multinode-edpm-base-crc
timeout: 10800
attempts: 1
nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-16-3xl
vars:
cifmw_extras:
- '@scenarios/centos-9/multinode-ci.yml'
crc_ci_bootstrap_cloud_name: "{{ nodepool.cloud | replace('-nodepool-tripleo','') }}"
crc_ci_bootstrap_networking:
networks:
default:
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}"
range: 192.168.122.0/24
internal-api:
vlan: 20
range: 172.17.0.0/24
storage:
vlan: 21
range: 172.18.0.0/24
tenant:
vlan: 22
range: 172.19.0.0/24
instances:
controller:
networks:
default:
ip: 192.168.122.11
crc:
networks:
default:
ip: 192.168.122.10
internal-api:
ip: 172.17.0.5
storage:
ip: 172.18.0.5
tenant:
ip: 172.19.0.5
compute-0:
networks:
default:
ip: 192.168.122.100
internal-api:
ip: 172.17.0.100
config_nm: false
storage:
ip: 172.18.0.100
config_nm: false
tenant:
ip: 172.19.0.100
config_nm: false
compute-1:
networks:
default:
ip: 192.168.122.101
internal-api:
ip: 172.17.0.101
config_nm: false
storage:
ip: 172.18.0.101
config_nm: false
tenant:
ip: 172.19.0.101
config_nm: false
run:
- ci/playbooks/edpm/run.yml

- job:
name: podified-multinode-edpm-deployment-crc-cloud
parent: base-crc-cloud
timeout: 10800
attempts: 1
nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-16-3xl
vars:
cifmw_extras:
- '@scenarios/centos-9/multinode-ci.yml'
crc_ci_bootstrap_cloud_name: "{{ nodepool.cloud | replace('-nodepool-tripleo','') }}"
crc_ci_bootstrap_networking:
networks:
default:
mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}"
router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}"
range: 192.168.122.0/24
internal-api:
vlan: 20
range: 172.17.0.0/24
storage:
vlan: 21
range: 172.18.0.0/24
tenant:
vlan: 22
range: 172.19.0.0/24
instances:
controller:
networks:
default:
ip: 192.168.122.11
crc:
networks:
default:
ip: 192.168.122.10
internal-api:
ip: 172.17.0.5
storage:
ip: 172.18.0.5
tenant:
ip: 172.19.0.5
compute-0:
networks:
default:
ip: 192.168.122.100
internal-api:
ip: 172.17.0.100
config_nm: false
storage:
ip: 172.18.0.100
config_nm: false
tenant:
ip: 172.19.0.100
config_nm: false
compute-1:
networks:
default:
ip: 192.168.122.101
internal-api:
ip: 172.17.0.101
config_nm: false
storage:
ip: 172.18.0.101
config_nm: false
tenant:
ip: 172.19.0.101
config_nm: false
run:
- ci/playbooks/edpm/run.yml

Expand All @@ -331,9 +552,13 @@
- ci/playbooks/edpm/run.yml
- ci/playbooks/edpm/update.yml





- job:
name: podified-multinode-hci-deployment-crc
parent: podified-multinode-hci-deployment-crc-3comp
parent: podified-multinode-hci-deployment-crc-3comp-crc-cloud
vars:
cifmw_extras:
- '@scenarios/centos-9/multinode-ci.yml'
Expand Down
4 changes: 2 additions & 2 deletions zuul.d/kuttl_multinode.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
- job:
name: cifmw-base-multinode-kuttl
parent: cifmw-podified-multinode-edpm-base-crc
parent: cifmw-podified-multinode-edpm-base-crc-cloud
timeout: 7200
abstract: true
nodeset: centos-9-medium-crc-extracted-2-39-0-3xl
nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-16-3xl
vars:
zuul_log_collection: true
extra-vars:
Expand Down
Loading

0 comments on commit adfaa01

Please sign in to comment.