From 1235c7253d2e29d089aa2810f9db6fab5b45121f Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Fri, 6 Oct 2023 14:10:10 +0100 Subject: [PATCH] CI: Adds a kolla-variables parent job This allows us to share variables between jobs without inheriting any of the pre-run, post-run or cleanup playbooks of the parent job. These run due to the zuul inheritance rules, see: https://zuul-ci.org/docs/zuul/latest/config/job.html#job Signed-off-by: Will Szumski Change-Id: Id0a34778accafdc62ebe916e81d69f31c6274d4c --- tests/run.yml | 11 ----------- zuul.d/base.yaml | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/tests/run.yml b/tests/run.yml index bf52178396..843f59cf18 100644 --- a/tests/run.yml +++ b/tests/run.yml @@ -256,17 +256,6 @@ virtualenv: "{{ kolla_ansible_venv_path }}" - name: install kolla-ansible and dependencies - vars: - ansible_core_version_min: "==2.14.*" - ansible_core_version_max: "==2.15.*" - # Test latest ansible version on Ubuntu, minimum supported on others. - ansible_core_version_constraint: >- - {{ ansible_core_version_min if is_upgrade or base_distro != 'ubuntu' else ansible_core_version_max }} - ansible_version_min: "==7.*" - ansible_version_max: "==8.*" - # Test latest ansible version on Ubuntu, minimum supported on others. - ansible_version_constraint: >- - {{ ansible_version_min if is_upgrade or base_distro != 'ubuntu' else ansible_version_max }} pip: extra_args: "-c {{ upper_constraints_file }}" name: diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 612a82b093..fb84aa36af 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -1,5 +1,40 @@ --- - job: + name: kolla-ansible-variables + vars: + previous_release: "2023.1" + container_engine: "docker" + scenario: core + virt_type: qemu + is_upgrade: no + api_network_prefix: "192.0.2." + api_network_prefix_length: "24" + api_interface_name: vxlan0 + kolla_internal_vip_address: "192.0.2.10" + address_family: 'ipv4' + neutron_external_network_prefix: "198.51.100." + neutron_external_network_prefix_length: "24" + neutron_external_bridge_name: br0 + neutron_external_interface_name: "veth-{{ neutron_external_bridge_name }}-ext" + neutron_external_vxlan_interface_name: vxlan1 + neutron_tenant_network_prefix: "203.0.113." + neutron_tenant_network_prefix_length: "24" + neutron_tenant_network_dns_server: "8.8.8.8" + tls_enabled: false + configure_swap_size: 0 + ansible_core_version_min: "==2.14.*" + ansible_core_version_max: "==2.15.*" + # Test latest ansible version on Ubuntu, minimum supported on others. + ansible_core_version_constraint: >- + {{ ansible_core_version_min if is_upgrade or base_distro != 'ubuntu' else ansible_core_version_max }} + ansible_version_min: "==7.*" + ansible_version_max: "==8.*" + # Test latest ansible version on Ubuntu, minimum supported on others. + ansible_version_constraint: >- + {{ ansible_version_min if is_upgrade or base_distro != 'ubuntu' else ansible_version_max }} + +- job: + parent: kolla-ansible-variables name: kolla-ansible-base pre-run: tests/pre.yml run: tests/run.yml