From 7255293b6a2d46bee03309d736666722dd7ed96e Mon Sep 17 00:00:00 2001 From: Pablo Rodriguez Nava Date: Mon, 14 Oct 2024 15:34:07 +0200 Subject: [PATCH] [DNM] Enable ironic testing in component lines --- ci/playbooks/bootstrap-networking-mapper.yml | 3 - ci/playbooks/edpm/fail.yml | 8 ++ playbooks/02-infra.yml | 14 +-- zuul.d/edpm_multinode.yaml | 47 +++++++++ zuul.d/projects.yaml | 103 +------------------ 5 files changed, 63 insertions(+), 112 deletions(-) create mode 100644 ci/playbooks/edpm/fail.yml diff --git a/ci/playbooks/bootstrap-networking-mapper.yml b/ci/playbooks/bootstrap-networking-mapper.yml index 954bb09229..5d91e085a8 100644 --- a/ci/playbooks/bootstrap-networking-mapper.yml +++ b/ci/playbooks/bootstrap-networking-mapper.yml @@ -24,6 +24,3 @@ -e @scenarios/centos-9/base.yml -e "@{{ ansible_user_dir }}/ci-framework-data/artifacts/parameters/zuul-params.yml" -e cifmw_networking_mapper_ifaces_info_path=/etc/ci/env/interfaces-info.yml - {% if nodepool is defined %} - -e "@{{ ansible_user_dir }}/ci-framework-data/artifacts/nodepool_params.yml" - {% endif %} diff --git a/ci/playbooks/edpm/fail.yml b/ci/playbooks/edpm/fail.yml new file mode 100644 index 0000000000..370acdf6b7 --- /dev/null +++ b/ci/playbooks/edpm/fail.yml @@ -0,0 +1,8 @@ +--- +- name: "Run ci/playbooks/edpm/fail.yml" + hosts: "{{ cifmw_zuul_target_host | default('all') }}" + gather_facts: true + tasks: + - name: Fail + ansible.builtin.fail: + msg: "Debug failure" diff --git a/playbooks/02-infra.yml b/playbooks/02-infra.yml index 7c8d637be7..a61547a85e 100644 --- a/playbooks/02-infra.yml +++ b/playbooks/02-infra.yml @@ -86,6 +86,13 @@ ansible.builtin.include_role: name: cert_manager + - name: Configure hosts networking using nmstate + when: + - cifmw_config_nmstate is defined + - cifmw_config_nmstate | bool + ansible.builtin.include_role: + name: ci_nmstate + - name: Deploy Sushy Emulator and configure controller as hypervisor when: - cifmw_enable_virtual_baremetal_support | default(false) | bool @@ -102,13 +109,6 @@ ansible.builtin.include_role: name: libvirt_manager - - name: Configure hosts networking using nmstate - when: - - cifmw_config_nmstate is defined - - cifmw_config_nmstate | bool - ansible.builtin.include_role: - name: ci_nmstate - - name: Prepare container package builder when: - cifmw_pkg_build_list is defined diff --git a/zuul.d/edpm_multinode.yaml b/zuul.d/edpm_multinode.yaml index eb429f8548..66c33b164a 100644 --- a/zuul.d/edpm_multinode.yaml +++ b/zuul.d/edpm_multinode.yaml @@ -445,6 +445,33 @@ parent: podified-multinode-edpm-deployment-crc-bootstrap-staging vars: cifmw_enable_virtual_baremetal_support: true + cifmw_config_nmstate: true + cifmw_ci_nmstate_instance_config: + controller: + interfaces: + - name: "{{ cifmw_networking_env_definition.instances['controller'].networks['baremetal'].interface_name }}" + type: ethernet + state: up + + - name: baremetal + type: linux-bridge + state: up + bridge: + options: + stp: + enabled: false + port: + - name: "{{ cifmw_networking_env_definition.instances['controller'].networks['baremetal'].interface_name }}" + stp-hairpin-mode: false + stp-path-cost: 100 + stp-priority: 32 + ipv4: + address: + - ip: "{{ cifmw_networking_env_definition.networks['baremetal'].network_v4 | ansible.utils.nthhost(11) }}" + prefix-length: 24 + enabled: true + ipv6: + enabled: false cifmw_networking_mapper_definition_patch_02_bmaas_net: networks: baremetal: @@ -462,6 +489,26 @@ baremetal: ip: "172.20.1.5" skip-nm-configuration: true + cifmw_libvirt_manager_configuration: + vms: + compute: + uefi: true + amount: 2 + root_part_id: 4 + disk_file_name: "blank" + disksize: 30 + memory: 4 + cpus: 4 + nets: + - baremetal + networks: + baremetal: | + + baremetal + + + + run: - ci/playbooks/edpm/run.yml - ci/playbooks/edpm/fail.yml diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 12f4f202f9..7fb48bc6dd 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -2,105 +2,4 @@ github-check: jobs: - noop - - cifmw-pod-ansible-test - - cifmw-pod-k8s-snippets-source - - cifmw-pod-pre-commit - - cifmw-pod-zuul-files - - cifmw-content-provider-build-images - - cifmw-edpm-build-images - - cifmw-multinode-kuttl - - cifmw-tcib - - cifmw-architecture-validate-hci - - ci-framework-openstack-meta-content-provider - - build-push-container-cifmw-client - - cifmw-molecule-artifacts - - cifmw-molecule-build_containers - - cifmw-molecule-build_openstack_packages - - cifmw-molecule-build_push_container - - cifmw-molecule-cert_manager - - cifmw-molecule-ci_gen_kustomize_values - - cifmw-molecule-ci_local_storage - - cifmw-molecule-ci_lvms_storage - - cifmw-molecule-ci_metallb - - cifmw-molecule-ci_multus - - cifmw-molecule-ci_netconfig - - cifmw-molecule-ci_network - - cifmw-molecule-ci_nmstate - - cifmw-molecule-ci_setup - - cifmw-molecule-cifmw_block_device - - cifmw-molecule-cifmw_ceph_client - - cifmw-molecule-cifmw_ceph_spec - - cifmw-molecule-cifmw_cephadm - - cifmw-molecule-cifmw_create_admin - - cifmw-molecule-cifmw_external_dns - - cifmw-molecule-cifmw_ntp - - cifmw-molecule-cifmw_test_role - - cifmw-molecule-compliance - - cifmw-molecule-config_drive - - cifmw-molecule-copy_container - - cifmw-molecule-deploy_bmh - - cifmw-molecule-devscripts - - cifmw-molecule-discover_latest_image - - cifmw-molecule-dlrn_promote - - cifmw-molecule-dlrn_report - - cifmw-molecule-dnsmasq - - cifmw-molecule-edpm_build_images - - cifmw-molecule-edpm_deploy - - cifmw-molecule-edpm_deploy_baremetal - - cifmw-molecule-edpm_kustomize - - cifmw-molecule-edpm_prepare - - cifmw-molecule-env_op_images - - cifmw-molecule-hci_prepare - - cifmw-molecule-hive - - cifmw-molecule-idrac_configuration - - cifmw-molecule-install_ca - - cifmw-molecule-install_openstack_ca - - cifmw-molecule-install_yamls - - cifmw-molecule-kustomize_deploy - - cifmw-molecule-libvirt_manager - - cifmw-molecule-manage_secrets - - cifmw-molecule-mirror_registry - - cifmw-molecule-nat64_appliance - - cifmw-molecule-networking_mapper - - cifmw-molecule-openshift_adm - - cifmw-molecule-openshift_login - - cifmw-molecule-openshift_obs - - cifmw-molecule-openshift_provisioner_node - - cifmw-molecule-openshift_setup - - cifmw-molecule-operator_build - - cifmw-molecule-operator_deploy - - cifmw-molecule-os_must_gather - - cifmw-molecule-os_net_setup - - cifmw-molecule-ovirt - - cifmw-molecule-pkg_build - - cifmw-molecule-podman - - cifmw-molecule-polarion - - cifmw-molecule-registry_deploy - - cifmw-molecule-repo_setup - - cifmw-molecule-reportportal - - cifmw-molecule-reproducer - - cifmw-molecule-rhol_crc - - cifmw-molecule-run_hook - - cifmw-molecule-set_openstack_containers - - cifmw-molecule-shiftstack - - cifmw-molecule-ssh_jumper - - cifmw-molecule-sushy_emulator - - cifmw-molecule-switch_config - - cifmw-molecule-tempest - - cifmw-molecule-test_deps - - cifmw-molecule-test_operator - - cifmw-molecule-tofu - - cifmw-molecule-update - - cifmw-molecule-update_containers - - cifmw-molecule-validations - - cifmw-molecule-virtualbmc - github-experimental-trigger: - jobs: - - downstream-va-hci-trigger-job - github-post: - jobs: - - build-push-container-cifmw-client-post - name: openstack-k8s-operators/ci-framework - templates: - - podified-multinode-edpm-ci-framework-pipeline - - data-plane-adoption-ci-framework-pipeline + - podified-multinode-edpm-deployment-crc-bootstrap-staging-ironic