From efa6988dfcadde70ba7b0a94651f26b10ce690a1 Mon Sep 17 00:00:00 2001 From: Lewis Denny Date: Wed, 25 Sep 2024 12:55:42 +1000 Subject: [PATCH] Add the Ironic baremetal net in a dedicated ci-bootstrap job --- ci/playbooks/bootstrap-networking-mapper.yml | 1 + hooks/playbooks/fetch_compute_facts.yml | 6 ++ zuul.d/base.yaml | 2 +- zuul.d/edpm_multinode.yaml | 107 ++++++++----------- zuul.d/nodeset.yaml | 17 +++ zuul.d/projects.yaml | 102 +----------------- 6 files changed, 69 insertions(+), 166 deletions(-) diff --git a/ci/playbooks/bootstrap-networking-mapper.yml b/ci/playbooks/bootstrap-networking-mapper.yml index e4120002db..d6157c8b25 100644 --- a/ci/playbooks/bootstrap-networking-mapper.yml +++ b/ci/playbooks/bootstrap-networking-mapper.yml @@ -33,6 +33,7 @@ -e @scenarios/centos-9/base.yml -e cifmw_networking_mapper_ifaces_info_path=/etc/ci/env/interfaces-info.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/hooks/playbooks/fetch_compute_facts.yml b/hooks/playbooks/fetch_compute_facts.yml index 96c3c183f8..646acf341c 100644 --- a/hooks/playbooks/fetch_compute_facts.yml +++ b/hooks/playbooks/fetch_compute_facts.yml @@ -26,10 +26,16 @@ - name: Load parameters ansible.builtin.include_vars: dir: "{{ item }}" +<<<<<<< HEAD ignore_unknown_extensions: true extensions: - yaml - yml +======= + ignore_unknown_extensions: True + extensions: + - 'yml' +>>>>>>> e766f26b (Add the Ironic baremetal net in a dedicated ci-bootstrap job) loop: - "{{ cifmw_basedir }}/artifacts/parameters" - "/etc/ci/env" diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 441b296e22..fe256e59b4 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -233,7 +233,7 @@ parent: base-extracted-crc-ci-bootstrap-staging timeout: 10800 attempts: 1 - nodeset: centos-9-medium-centos-9-crc-extracted-2-39-0-3xl + nodeset: centos-9-medium-centos-9-crc-extracted-2-39-0-3xl-vexxhost irrelevant-files: *ir_files required-projects: *multinode_edpm_rp roles: *multinode_edpm_roles diff --git a/zuul.d/edpm_multinode.yaml b/zuul.d/edpm_multinode.yaml index 32465a3cbe..96e1d2da4b 100644 --- a/zuul.d/edpm_multinode.yaml +++ b/zuul.d/edpm_multinode.yaml @@ -367,64 +367,6 @@ # TODO: to be removed after removing its dependency in ci-bootstrap crc_ci_bootstrap_networking: {} vars: &edpm_bootstrap_vars - cifmw_networking_definition: - networks: - default: - network: "192.168.122.0/24" - gateway: "192.168.122.1" - mtu: 1500 - internal-api: - network: "172.17.0.0/24" - gateway: "172.17.0.1" - vlan: 20 - storage: - network: "172.18.0.0/24" - gateway: "172.18.0.1" - vlan: 21 - tenant: - network: "172.19.0.0/24" - gateway: "172.19.0.1" - vlan: 22 - 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: - skip-nm-configuration: true - networks: - default: - ip: "192.168.122.100" - internal-api: - ip: "172.17.0.100" - trunk_parent: default - storage: - ip: "172.18.0.100" - trunk_parent: default - tenant: - ip: "172.19.0.100" - trunk_parent: default - cifmw_extras: - - '@scenarios/centos-9/multinode-ci.yml' - run: - - ci/playbooks/edpm/run.yml - -# Job with ci-bootstrap staging branch job - to be used to test ci-bootstrap -- job: - name: podified-multinode-edpm-deployment-crc-bootstrap-staging - parent: cifmw-podified-multinode-edpm-ci-bootstrap-staging - extra-vars: *edpm_bootstrap_extra_vars - vars: cifmw_networking_definition: networks: default: @@ -457,13 +399,13 @@ networks: default: {} internal-api: - trunk_parent: default + trunk-parent: default skip-nm-configuration: true tenant: - trunk_parent: default + trunk-parent: default skip-nm-configuration: true storage: - trunk_parent: default + trunk-parent: default skip-nm-configuration: true instances: controller: @@ -476,14 +418,51 @@ ip: "192.168.122.10" internal-api: ip: "172.17.0.5" - trunk_parent: default + trunk-parent: default storage: ip: "172.18.0.5" - trunk_parent: default + trunk-parent: default tenant: ip: "172.19.0.5" - trunk_parent: default + trunk-parent: default + cifmw_extras: + - '@scenarios/centos-9/multinode-ci.yml' + run: + - ci/playbooks/edpm/run.yml + +# Job with ci-bootstrap staging branch job - to be used to test ci-bootstrap +- job: + name: podified-multinode-edpm-deployment-crc-bootstrap-staging + parent: cifmw-podified-multinode-edpm-ci-bootstrap-staging + extra-vars: *edpm_bootstrap_extra_vars + vars: *edpm_bootstrap_vars + run: + - ci/playbooks/edpm/run.yml + +# TODO: Testing Ironic jobs definition +- job: + name: podified-multinode-edpm-deployment-crc-bootstrap-staging-ironic + parent: podified-multinode-edpm-deployment-crc-bootstrap-staging + vars: + cifmw_networking_mapper_definition_patch_02_bmaas_net: + networks: + baremetal: + network: "172.20.1.0/24" + gateway: "172.20.1.1" + mtu: 1500 + instances: + controller: + networks: + baremetal: + ip: "172.20.1.11" + skip-nm-configuration: true + crc: + networks: + baremetal: + ip: "172.20.1.5" + skip-nm-configuration: true cifmw_extras: - '@scenarios/centos-9/multinode-ci.yml' run: - ci/playbooks/edpm/run.yml + - ci/playbooks/edpm/fail.yml diff --git a/zuul.d/nodeset.yaml b/zuul.d/nodeset.yaml index 9fdc075b13..bbfc469696 100644 --- a/zuul.d/nodeset.yaml +++ b/zuul.d/nodeset.yaml @@ -313,6 +313,23 @@ - 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-extracted-2-39-0-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: coreos-crc-extracted-2-39-0-3xl + groups: + - name: computes + nodes: + - compute-0 + - name: ocps + nodes: + - crc - nodeset: name: centos-9-crc-2-39-0-6xlarge diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 12f4f202f9..074011b984 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -2,105 +2,5 @@ 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 + - podified-multinode-edpm-deployment-crc-bootstrap-staging-ironic name: openstack-k8s-operators/ci-framework - templates: - - podified-multinode-edpm-ci-framework-pipeline - - data-plane-adoption-ci-framework-pipeline