diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2025-02-17 14:03:04 +0100 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2025-02-18 08:14:58 +0000 |
| commit | c8d813c09c793bbc0dcf2717fb8cd83c6dee98ae (patch) | |
| tree | 4f83a2d877f71c0704efc508157d589b1f3145af | |
| parent | 2e99f855387448211cbc1aec3b531a7c6487928d (diff) | |
| download | kolla-ansible-c8d813c09c793bbc0dcf2717fb8cd83c6dee98ae.tar.gz kolla-ansible-c8d813c09c793bbc0dcf2717fb8cd83c6dee98ae.zip | |
CI: Remove unnecessary ansible values (after migration to ansible-core)
Change-Id: Ibd5095f55c64031d13160107dcbd9fed98a1bd87
| -rw-r--r-- | tests/run.yml | 3 | ||||
| -rw-r--r-- | zuul.d/base.yaml | 8 |
2 files changed, 0 insertions, 11 deletions
diff --git a/tests/run.yml b/tests/run.yml index af07a8ce4..0ca34f363 100644 --- a/tests/run.yml +++ b/tests/run.yml @@ -670,14 +670,11 @@ vars: ansible_core_version_constraint: >- {{ ansible_core_version_min if is_upgrade or base_distro != 'ubuntu' else ansible_core_version_max }} - 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: - "{{ kolla_ansible_src_dir }}" - "ansible-core{{ ansible_core_version_constraint }}" - - "ansible{{ ansible_version_constraint }}" - "ara<1.0.0" virtualenv: "{{ kolla_ansible_venv_path }}" when: is_slurp diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index bac79f8ab..70eaf3046 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -10,14 +10,6 @@ ansible_core_version_slurp: "==2.16.*" ansible_core_version_max: "==2.17.*" ansible_core_version_min: "==2.16.*" - # Test latest ansible-core version on Ubuntu, minimum supported on others. - # Use SLURP version (two releases back) on SLURP upgrades. - # TODO(mnasiadka): Remove in D. - ansible_version_constraint: >- - {{ ansible_version_slurp if is_slurp else ansible_version_min if is_upgrade or ansible_facts.distribution != "Ubuntu" else ansible_version_max }} - ansible_version_slurp: "==9.*" - ansible_version_min: "==9.*" - ansible_version_max: "==10.*" # NOTE(mgoddard): Test the use of interface names with dashes. api_interface_name: "vxlan-0" api_network_prefix: "192.0.2." |