CI: Drop duplicated variables in base.yaml

Change-Id: I168f3bb81731e56ae338c4438ab4d024fa69d827
This commit is contained in:
Michal Nasiadka 2023-12-15 09:06:12 +01:00
parent 7fc76fb4e9
commit d05a1560bc
1 changed files with 24 additions and 45 deletions

View File

@ -2,36 +2,37 @@
- 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.*"
ansible_core_version_max: "==2.15.*"
ansible_core_version_min: "==2.14.*"
# 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 }}
ansible_version_max: "==8.*"
ansible_version_min: "==7.*"
api_interface_name: vxlan0
api_network_prefix: "192.0.2."
api_network_prefix_length: "24"
configure_swap_size: 0
container_engine: "docker"
is_upgrade: false
kolla_internal_vip_address: "192.0.2.10"
le_enabled: false
neutron_external_bridge_name: br0
neutron_external_interface_name: "veth-{{ neutron_external_bridge_name }}-ext"
neutron_external_network_prefix: "198.51.100."
neutron_external_network_prefix_length: "24"
neutron_external_vxlan_interface_name: vxlan1
neutron_tenant_network_dns_server: "8.8.8.8"
neutron_tenant_network_prefix: "203.0.113."
neutron_tenant_network_prefix_length: "24"
previous_release: "2023.1"
scenario: core
tls_enabled: false
virt_type: qemu
- job:
parent: kolla-ansible-variables
@ -62,28 +63,6 @@
- ^kolla_ansible/tests/
- ^tools/validate-.*$
- ^zuul\.d/
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
le_enabled: false
configure_swap_size: 0
roles:
- zuul: zuul/zuul-jobs
- zuul: openstack/kolla