diff --git a/ci/playbooks/collect-logs.yml b/ci/playbooks/collect-logs.yml index d6e5b83a17..ad576d15b1 100644 --- a/ci/playbooks/collect-logs.yml +++ b/ci/playbooks/collect-logs.yml @@ -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: diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 441b296e22..dd3db16760 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -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 @@ -204,6 +205,7 @@ tenant: ip: 172.19.0.100 config_nm: false + # # Base jobs using ci-bootstrap layout # @@ -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: true + 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 diff --git a/zuul.d/edpm_multinode.yaml b/zuul.d/edpm_multinode.yaml index 32465a3cbe..f145970b91 100644 --- a/zuul.d/edpm_multinode.yaml +++ b/zuul.d/edpm_multinode.yaml @@ -144,7 +144,7 @@ - job: name: podified-multinode-hci-deployment-crc-3comp parent: podified-multinode-edpm-deployment-crc - nodeset: centos-9-medium-3x-centos-9-crc-extracted-2-39-0-xxl + 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','') }}" @@ -235,7 +235,7 @@ - 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 @@ -312,7 +312,10 @@ - job: name: podified-multinode-edpm-deployment-crc - parent: cifmw-podified-multinode-edpm-base-crc + 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' diff --git a/zuul.d/kuttl_multinode.yaml b/zuul.d/kuttl_multinode.yaml index 25e3efc700..03fd4ddf30 100644 --- a/zuul.d/kuttl_multinode.yaml +++ b/zuul.d/kuttl_multinode.yaml @@ -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: diff --git a/zuul.d/nodeset.yaml b/zuul.d/nodeset.yaml index 9fdc075b13..e7b7ac1b3d 100644 --- a/zuul.d/nodeset.yaml +++ b/zuul.d/nodeset.yaml @@ -325,3 +325,43 @@ nodes: - name: controller label: centos-9-stream-crc-2-39-0-xl + +- nodeset: + name: centos-9-medium-centos-9-crc-cloud-ocp-4-16-3xl + nodes: + - name: controller + label: cloud-centos-9-stream-tripleo-medium + - name: compute-0 + label: cloud-centos-9-stream-tripleo + - name: crc + label: crc-cloud-ocp-4-16-4-3xl + groups: + - name: computes + nodes: + - compute-0 + - name: ocps + nodes: + - crc + +- nodeset: + name: centos-9-medium-3x-centos-9-crc-cloud-ocp-4-16-xxl + nodes: + - name: controller + label: cloud-centos-9-stream-tripleo-medium + - name: compute-0 + label: cloud-centos-9-stream-tripleo + - name: compute-1 + label: cloud-centos-9-stream-tripleo + - name: compute-2 + label: cloud-centos-9-stream-tripleo + - name: crc + label: crc-cloud-ocp-4-16-0-3xl + groups: + - name: computes + nodes: + - compute-0 + - compute-1 + - compute-2 + - name: ocps + nodes: + - crc diff --git a/zuul.d/podified_multinode.yaml b/zuul.d/podified_multinode.yaml index 45d4470419..0f894e028d 100644 --- a/zuul.d/podified_multinode.yaml +++ b/zuul.d/podified_multinode.yaml @@ -9,10 +9,10 @@ - job: name: cifmw-base-multinode-podified - parent: cifmw-podified-multinode-edpm-base-crc + parent: cifmw-podified-multinode-edpm-base-crc-cloud timeout: 5400 abstract: true - nodeset: centos-9-medium-crc-extracted-2-39-0-3xl + nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-16-3xl run: - ci/playbooks/edpm/run.yml extra-vars: diff --git a/zuul.d/tempest_multinode.yaml b/zuul.d/tempest_multinode.yaml index a23237657c..2bddfaad8c 100644 --- a/zuul.d/tempest_multinode.yaml +++ b/zuul.d/tempest_multinode.yaml @@ -1,10 +1,10 @@ --- - job: name: cifmw-base-multinode-tempest - parent: cifmw-podified-multinode-edpm-base-crc + parent: cifmw-podified-multinode-edpm-base-crc-cloud timeout: 5400 abstract: true - nodeset: centos-9-medium-crc-extracted-2-39-0-3xl + nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-16-3xl description: | Base multinode job definition for running test-operator. vars: @@ -117,6 +117,7 @@ - job: name: cifmw-multinode-tempest parent: podified-multinode-edpm-deployment-crc-tempest + nodeset: centos-9-medium-centos-9-crc-cloud-ocp-4-16-3xl files: - ^roles/test_operator - ^scenarios/centos-9/multinode-ci.yml