From e3d0bdd8d9cfca769aaaeb1ab6b2fba1c2671d75 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Thu, 29 May 2025 13:34:45 +0200 Subject: [PATCH] Bump Ansible version to 11 for ELK With that we are removing Ubuntu Jammy testing, as Python version does not meet minimal requirements for Ansible 11. Change-Id: Ia0576f1b104dca27b78c105b80d5b038fcd6a4c9 --- elk_metrics_7x/tests/functional.yml | 2 +- zuul.d/jobs.yaml | 9 ++------- zuul.d/project.yaml | 1 - 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/elk_metrics_7x/tests/functional.yml b/elk_metrics_7x/tests/functional.yml index da2da366..ec366e41 100644 --- a/elk_metrics_7x/tests/functional.yml +++ b/elk_metrics_7x/tests/functional.yml @@ -29,7 +29,7 @@ ANSIBLE_TRANSPORT: openstack.osa.ssh ANSIBLE_COLLECTIONS_PATH: "${HOME}/ansible_venv/repositories" ANSIBLE_ROLES_PATH: "${HOME}/ansible_venv/repositories/roles" - ANSIBLE_VERSION: 10.7.0 + ANSIBLE_VERSION: 11.6.0 vars: inventory_file: "inventory/test-{{ (container_inventory | bool) | ternary('container', 'metal') }}-inventory.yml" diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index d0a322d9..87ff3df7 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -14,9 +14,9 @@ # limitations under the License. - job: - name: "openstack-ansible-ops:elk_metrics_7x-ubuntu-jammy" + name: "openstack-ansible-ops:elk_metrics_7x-ubuntu-noble" parent: base - nodeset: ubuntu-jammy + nodeset: ubuntu-noble description: "Runs a gate test on the elk_metrics_7x project." run: "elk_metrics_7x/tests/test.yml" post-run: "elk_metrics_7x/tests/post-run.yml" @@ -27,11 +27,6 @@ osa_test_repo: "openstack/openstack-ansible-ops" test_clustered_elk: false -- job: - name: "openstack-ansible-ops:elk_metrics_7x-ubuntu-noble" - parent: "openstack-ansible-ops:elk_metrics_7x-ubuntu-jammy" - nodeset: ubuntu-noble - - job: name: "openstack-ansible-ops:osquery-ubuntu-jammy" parent: base diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 928b33c4..8e4af953 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -20,7 +20,6 @@ check: jobs: - openstack-ansible-linters - - openstack-ansible-ops:elk_metrics_7x-ubuntu-jammy - openstack-ansible-ops:elk_metrics_7x-ubuntu-noble - openstack-ansible-deploy-aio_magnum_octavia_capi_kvm_ops-ubuntu-jammy-v1.29.6 - openstack-ansible-deploy-aio_magnum_octavia_capi_kvm_ops-ubuntu-jammy-v1.30.2