diff --git a/ci/playbooks/kuttl/run-kuttl-tests.yml b/ci/playbooks/kuttl/run-kuttl-tests.yml index f2ca594865..4ff8f550e7 100644 --- a/ci/playbooks/kuttl/run-kuttl-tests.yml +++ b/ci/playbooks/kuttl/run-kuttl-tests.yml @@ -43,6 +43,12 @@ loop: "{{ commands_before_kuttl_run }}" ignore_errors: true +- name: Install certmanager operator role +# when: +# - cifmw_config_certmanager is defined +# - cifmw_config_certmanager | bool + ansible.builtin.include_role: + name: cert_manager - name: 'Set make_{{ operator }}_kuttl_env vars' ansible.builtin.set_fact: diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 2b0d1e6081..29fb9bf9e1 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -307,3 +307,18 @@ - ci/playbooks/e2e-prepare.yml - ci/playbooks/dump_zuul_data.yml - ci/playbooks/bootstrap-networking-mapper.yml + + +######## CRC CLOUD ########## +- 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-18-1-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 diff --git a/zuul.d/edpm_multinode.yaml b/zuul.d/edpm_multinode.yaml index 5eadecd4b2..8b2a100cfd 100644 --- a/zuul.d/edpm_multinode.yaml +++ b/zuul.d/edpm_multinode.yaml @@ -143,8 +143,9 @@ - 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 + #parent: podified-multinode-edpm-deployment-crc-cloud + parent: podified-multinode-edpm-deployment-crc-cloud + nodeset: centos-9-medium-3x-centos-9-crc-cloud-ocp-4-18-1-xxl vars: cifmw_edpm_deploy_hci: true crc_ci_bootstrap_cloud_name: "{{ nodepool.cloud | replace('-nodepool-tripleo','') }}" @@ -310,9 +311,19 @@ - cinder-operator cifmw_tempest_default_jobs: *tempest_tests_single_hci +#- job: +# name: podified-multinode-edpm-deployment-crc +# parent: cifmw-podified-multinode-edpm-base-crc +# vars: +# cifmw_extras: +# - '@scenarios/centos-9/multinode-ci.yml' +# - '@scenarios/centos-9/horizon.yml' +# run: +# - ci/playbooks/edpm/run.yml + - job: name: podified-multinode-edpm-deployment-crc - parent: cifmw-podified-multinode-edpm-base-crc + parent: cifmw-podified-multinode-edpm-base-crc-cloud vars: cifmw_extras: - '@scenarios/centos-9/multinode-ci.yml' @@ -522,3 +533,27 @@ run: - ci/playbooks/edpm/run.yml + + +### CRC CLOUD ### +- job: + name: podified-multinode-edpm-deployment-crc-cloud + parent: cifmw-podified-multinode-edpm-base-crc-cloud + vars: + cifmw_extras: + - '@scenarios/centos-9/multinode-ci.yml' + - '@scenarios/centos-9/horizon.yml' + run: + - ci/playbooks/edpm/run.yml + +- job: + name: podified-multinode-edpm-update-crc-cloud + parent: cifmw-podified-multinode-edpm-base-crc-cloud + vars: + cifmw_extras: + - '@scenarios/centos-9/multinode-ci.yml' + cifmw_run_update: true + cifmw_run_tests: true + run: + - ci/playbooks/edpm/run.yml + - ci/playbooks/edpm/update.yml diff --git a/zuul.d/kuttl_multinode.yaml b/zuul.d/kuttl_multinode.yaml index bb9a8f1386..9ea393ec33 100644 --- a/zuul.d/kuttl_multinode.yaml +++ b/zuul.d/kuttl_multinode.yaml @@ -51,7 +51,7 @@ - job: name: cifmw-multinode-kuttl - parent: cifmw-base-multinode-kuttl + parent: cifmw-base-multinode-kuttl-crc-cloud timeout: 9000 files: - ^ci/playbooks/kuttl/.* @@ -85,3 +85,91 @@ - ci/playbooks/kuttl/kuttl-from-operator-run.yaml vars: cifmw_target_host: controller + +### CRC CLOUD ### +- job: + name: cifmw-base-multinode-kuttl-crc-cloud + parent: cifmw-podified-multinode-edpm-base-crc-cloud + timeout: 7200 + abstract: true + nodeset: centos-9-medium-crc-cloud-ocp-4-18-1-3xl + vars: + zuul_log_collection: true + extra-vars: + crc_ci_bootstrap_cloud_name: "{{ nodepool.cloud | replace('-nodepool-tripleo','') }}" + crc_ci_bootstrap_networking: + networks: + default: + range: 192.168.122.0/24 + mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}" + router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}" + 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 + pre-run: + - ci/playbooks/e2e-prepare.yml + run: + - ci/playbooks/dump_zuul_data.yml + - ci/playbooks/kuttl/run.yml + post-run: + - ci/playbooks/collect-logs.yml + required-projects: + - github.com/openstack-k8s-operators/install_yamls + +- job: + name: cifmw-multinode-kuttl-crc-cloud + parent: cifmw-base-multinode-kuttl-crc-cloud + timeout: 9000 + files: + - ^ci/playbooks/kuttl/.* + - ^scenarios/centos-9/kuttl.yml + - ^zuul.d/kuttl.yaml + vars: + cifmw_extras: + - '@scenarios/centos-9/kuttl_multinode.yml' + cifmw_kuttl_tests_operator_list: + - openstack + - barbican + - keystone + - horizon + commands_before_kuttl_run: + - oc get pv + - oc get all + commands_after_kuttl_run: + - oc get pv + - oc get all + +- job: + name: cifmw-multinode-kuttl-operator-target-crc-cloud + parent: cifmw-base-multinode-kuttl-crc-cloud + description: | + This job runs kuttl tests from the operator Make targets, + without relying on install_yamls. + dependencies: ["openstack-meta-content-provider"] + pre-run: + - ci/playbooks/kuttl/kuttl-from-operator-deps.yaml + run: + - ci/playbooks/kuttl/kuttl-from-operator-run.yaml + vars: + cifmw_target_host: controller diff --git a/zuul.d/nodeset.yaml b/zuul.d/nodeset.yaml index 22a6ae37c8..82dea82f21 100644 --- a/zuul.d/nodeset.yaml +++ b/zuul.d/nodeset.yaml @@ -623,3 +623,246 @@ nodes: - name: controller label: centos-9-stream-crc-2-39-0-6xlarge-ibm + +#### CRC CLOUD #### +- nodeset: + name: centos-9-medium-crc-cloud-ocp-4-18-1-3xl + nodes: + - name: controller + label: cloud-centos-9-stream-tripleo-medium + - name: crc + label: crc-cloud-ocp-4-18-1-3xl + groups: + - name: computes + nodes: [] + - name: ocps + nodes: + - crc + +- nodeset: + name: centos-9-rhel-9-2-crc-cloud-ocp-4-18-1-3xl + nodes: + - name: controller + label: cloud-centos-9-stream-tripleo + - name: crc + label: crc-cloud-ocp-4-18-1-3xl + - name: standalone + label: cloud-rhel-9-2-tripleo + groups: + - name: computes + nodes: [] + - name: ocps + nodes: + - crc + - name: rh-subscription + nodes: + - standalone + +- nodeset: + name: centos-9-multinode-rhel-9-2-crc-cloud-ocp-4-18-1-3xl + nodes: + - name: controller + label: cloud-centos-9-stream-tripleo + - name: crc + label: crc-cloud-ocp-4-18-1-3xl + - name: undercloud + label: cloud-rhel-9-2-tripleo + - name: overcloud-controller-0 + label: cloud-rhel-9-2-tripleo + - name: overcloud-controller-1 + label: cloud-rhel-9-2-tripleo + - name: overcloud-controller-2 + label: cloud-rhel-9-2-tripleo + - name: overcloud-novacompute-0 + label: cloud-rhel-9-2-tripleo + - name: overcloud-novacompute-1 + label: cloud-rhel-9-2-tripleo + - name: overcloud-novacompute-2 + label: cloud-rhel-9-2-tripleo + groups: + - name: computes + nodes: [] + - name: ocps + nodes: + - crc + - name: rh-subscription + nodes: + - undercloud + - overcloud-controller-0 + - overcloud-controller-1 + - overcloud-controller-2 + - overcloud-novacompute-0 + - overcloud-novacompute-1 + - overcloud-novacompute-2 + - name: tripleo_controllers + nodes: + - overcloud-controller-0 + - overcloud-controller-1 + - overcloud-controller-2 + - name: tripleo_computes + nodes: + - overcloud-novacompute-0 + - overcloud-novacompute-1 + - overcloud-novacompute-2 + +- nodeset: + name: centos-9-multinode-rhel-9-2-crc-cloud-ocp-4-18-1-3xl-novacells + nodes: + - name: controller + label: cloud-centos-9-stream-tripleo + - name: crc + label: crc-cloud-ocp-4-18-1-3xl + - name: undercloud + label: cloud-rhel-9-2-tripleo + - name: overcloud-controller-0 + label: cloud-rhel-9-2-tripleo + - name: cell1-controller-0 + label: cloud-rhel-9-2-tripleo + - name: cell1-compute-0 + label: cloud-rhel-9-2-tripleo + - name: cell2-controller-compute-0 + label: cloud-rhel-9-2-tripleo + groups: + - name: computes + nodes: [] + - name: ocps + nodes: + - crc + - name: rh-subscription + nodes: + - undercloud + - overcloud-controller-0 + - cell1-controller-0 + - cell2-controller-compute-0 + - cell1-compute-0 + - name: tripleo_controllers + nodes: + - overcloud-controller-0 + - cell1-controller-0 + - cell2-controller-compute-0 + - name: tripleo_computes + nodes: + - cell1-compute-0 + - cell2-controller-compute-0 + +- nodeset: + name: centos-9-medium-centos-9-crc-cloud-ocp-4-18-1-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-18-1-3xl + groups: + - name: computes + nodes: + - compute-0 + - name: ocps + nodes: + - crc + +- nodeset: + name: centos-9-medium-2x-centos-9-crc-cloud-ocp-4-18-1-xxl + nodes: + - name: controller + label: cloud-centos-9-stream-tripleo-medium + # Note(Chandan Kumar): Switch to xxl nodeset once RHOSZUUL-1940 resolves + - name: compute-0 + label: cloud-centos-9-stream-tripleo + - name: compute-1 + label: cloud-centos-9-stream-tripleo + - name: crc + label: crc-cloud-ocp-4-18-1-xxl + groups: + - name: computes + nodes: + - compute-0 + - compute-1 + - name: ocps + nodes: + - crc + +- nodeset: + name: centos-9-2x-centos-9-xxl-crc-cloud-ocp-4-18-1-xxl + nodes: + - name: controller + label: cloud-centos-9-stream-tripleo + - name: compute-0 + label: cloud-centos-9-stream-tripleo-xxl + - name: compute-1 + label: cloud-centos-9-stream-tripleo-xxl + - name: crc + label: crc-cloud-ocp-4-18-1-xxl + groups: + - name: computes + nodes: + - compute-0 + - compute-1 + - name: ocps + nodes: + - crc + +- nodeset: + name: centos-9-medium-3x-centos-9-crc-cloud-ocp-4-18-1-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-18-1-xxl + groups: + - name: computes + nodes: + - compute-0 + - compute-1 + - compute-2 + - name: ocps + nodes: + - crc + +- nodeset: + name: centos-9-medium-3x-centos-9-crc-cloud-ocp-4-18-1-3xl + 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-18-1-3xl + groups: + - name: computes + nodes: + - compute-0 + - compute-1 + - compute-2 + - name: ocps + nodes: + - crc + +# todo: Remove. Temporal. Needed as the credentials used in ci-bootstrap jobs for IBM don't work +- nodeset: + name: centos-9-medium-centos-9-crc-cloud-ocp-4-18-1-3xl-vexxhost + nodes: + - name: controller + label: cloud-centos-9-stream-tripleo-vexxhost-medium + - name: compute-0 + label: cloud-centos-9-stream-tripleo-vexxhost + - name: crc + label: crc-cloud-ocp-4-18-1-3xl + groups: + - name: computes + nodes: + - compute-0 + - name: ocps + nodes: + - crc diff --git a/zuul.d/podified_multinode.yaml b/zuul.d/podified_multinode.yaml index 45d4470419..5b8f274d93 100644 --- a/zuul.d/podified_multinode.yaml +++ b/zuul.d/podified_multinode.yaml @@ -60,3 +60,53 @@ cifmw_extras: - '@scenarios/centos-9/podified_common.yml' - '@scenarios/centos-9/ironic.yml' + +### CRC CLOUD ### +- job: + name: cifmw-base-multinode-podified-crc-cloud + parent: cifmw-podified-multinode-edpm-base-crc-cloud + timeout: 5400 + abstract: true + nodeset: centos-9-medium-crc-cloud-ocp-4-18-1-3xl + run: + - ci/playbooks/edpm/run.yml + extra-vars: + crc_ci_bootstrap_cloud_name: "{{ nodepool.cloud | replace('-nodepool-tripleo','') }}" + crc_ci_bootstrap_networking: + networks: + default: + range: 192.168.122.0/24 + mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}" + router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}" + 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 + +- job: + name: podified-multinode-ironic-deployment-crc-cloud + parent: cifmw-base-multinode-podified-crc-cloud + vars: + cifmw_extras: + - '@scenarios/centos-9/podified_common.yml' + - '@scenarios/centos-9/ironic.yml' diff --git a/zuul.d/tempest_multinode.yaml b/zuul.d/tempest_multinode.yaml index a23237657c..77b01819c0 100644 --- a/zuul.d/tempest_multinode.yaml +++ b/zuul.d/tempest_multinode.yaml @@ -66,7 +66,7 @@ - job: name: podified-multinode-edpm-deployment-crc-tempest - parent: podified-multinode-edpm-deployment-crc + parent: podified-multinode-edpm-deployment-crc-cloud vars: cifmw_extras: - '@scenarios/centos-9/ci.yml' @@ -123,3 +123,71 @@ - ^scenarios/centos-9/ci.yml - ^scenarios/centos-9/ceph_backends.yml - ^zuul.d/tempest_multinode.yaml + + + +### CRC CLOUD ### +- job: + name: cifmw-base-multinode-tempest-crc-cloud + parent: cifmw-podified-multinode-edpm-base-crc-cloud + timeout: 5400 + abstract: true + nodeset: centos-9-medium-crc-cloud-ocp-4-18-1-3xl + description: | + Base multinode job definition for running test-operator. + vars: + zuul_log_collection: true + cifmw_deploy_edpm: false + # disable operator build + cifmw_operator_build_meta_build: false + cifmw_operator_build_operators: [] + cifmw_run_test_role: test_operator + cifmw_test_operator_tempest_tests_include_override_scenario: true + extra-vars: + crc_ci_bootstrap_cloud_name: "{{ nodepool.cloud | replace('-nodepool-tripleo','') }}" + crc_ci_bootstrap_networking: + networks: + default: + range: 192.168.122.0/24 + mtu: "{{ ('ibm' in nodepool.cloud) | ternary('1440', '1500') }}" + router_net: "{{ ('ibm' in nodepool.cloud) | ternary('hostonly', 'public') }}" + 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 + cifmw_extras: + - '@scenarios/centos-9/ci.yml' + - '@scenarios/centos-9/multinode-ci.yml' + - '@scenarios/centos-9/ceph_backends.yml' + pre-run: + - ci/playbooks/e2e-prepare.yml + run: + - ci/playbooks/e2e-run.yml + required-projects: + - github.com/openstack-k8s-operators/install_yamls + - openstack-k8s-operators/ci-framework + - openstack-k8s-operators/infra-operator + - openstack-k8s-operators/openstack-baremetal-operator + - openstack-k8s-operators/openstack-operator + - openstack-k8s-operators/repo-setup + - openstack-k8s-operators/edpm-ansible