From efb7bff77cacb259b95a65cb7432809872d09dd1 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Mon, 9 Mar 2026 15:27:08 -0600 Subject: [PATCH] ci: tox-lsr 3.16.0 - fix qemu tox test failures - rename to qemu-ansible-core-X-Y [citest_skip] the latest version of tox 4.49 has a strange issue - it thinks that a tox testenv like `[qemu-ansible-core-2.20]` is specifying python 2.20 which conflicts with the testenv basepython of python 3.latest. There appears to be no way to workaround this. So, rename all of the testenvs to use `major-minor` instead of `major.minor` e.g. `[qemu-ansible-core-2-20]` Signed-off-by: Rich Megginson --- .github/workflows/ansible-lint.yml | 2 +- .../workflows/ansible-managed-var-comment.yml | 2 +- .github/workflows/ansible-test.yml | 2 +- .../workflows/qemu-kvm-integration-tests.yml | 28 +++++++++---------- contributing.md | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ansible-lint.yml b/.github/workflows/ansible-lint.yml index d8df04ad55..8cd9a59914 100644 --- a/.github/workflows/ansible-lint.yml +++ b/.github/workflows/ansible-lint.yml @@ -35,7 +35,7 @@ jobs: - name: Install tox, tox-lsr run: | set -euxo pipefail - pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.15.0" + pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.16.0" - name: Convert role to collection format id: collection diff --git a/.github/workflows/ansible-managed-var-comment.yml b/.github/workflows/ansible-managed-var-comment.yml index daff00d396..adeffab4a9 100644 --- a/.github/workflows/ansible-managed-var-comment.yml +++ b/.github/workflows/ansible-managed-var-comment.yml @@ -33,7 +33,7 @@ jobs: - name: Install tox, tox-lsr run: | set -euxo pipefail - pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.15.0" + pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.16.0" - name: Run ansible-plugin-scan run: | diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index 243486e436..c766b2e3ad 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -36,7 +36,7 @@ jobs: - name: Install tox, tox-lsr run: | set -euxo pipefail - pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.15.0" + pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.16.0" - name: Convert role to collection format run: | diff --git a/.github/workflows/qemu-kvm-integration-tests.yml b/.github/workflows/qemu-kvm-integration-tests.yml index 86820c6cd5..e66e78d1d8 100644 --- a/.github/workflows/qemu-kvm-integration-tests.yml +++ b/.github/workflows/qemu-kvm-integration-tests.yml @@ -28,22 +28,22 @@ jobs: matrix: scenario: # QEMU - - { image: "centos-9", env: "qemu-ansible-core-2.16" } - - { image: "centos-10", env: "qemu-ansible-core-2.17" } - - { image: "fedora-42", env: "qemu-ansible-core-2.19" } - - { image: "fedora-43", env: "qemu-ansible-core-2.19" } - - { image: "leap-15.6", env: "qemu-ansible-core-2.18" } + - { image: "centos-9", env: "qemu-ansible-core-2-16" } + - { image: "centos-10", env: "qemu-ansible-core-2-17" } + - { image: "fedora-42", env: "qemu-ansible-core-2-19" } + - { image: "fedora-43", env: "qemu-ansible-core-2-19" } + - { image: "leap-15.6", env: "qemu-ansible-core-2-18" } # container - - { image: "centos-9", env: "container-ansible-core-2.16" } - - { image: "centos-9-bootc", env: "container-ansible-core-2.16" } + - { image: "centos-9", env: "container-ansible-core-2-16" } + - { image: "centos-9-bootc", env: "container-ansible-core-2-16" } # broken on non-running dbus - # - { image: "centos-10", env: "container-ansible-core-2.17" } - - { image: "centos-10-bootc", env: "container-ansible-core-2.17" } - - { image: "fedora-42", env: "container-ansible-core-2.17" } - - { image: "fedora-43", env: "container-ansible-core-2.19" } - - { image: "fedora-42-bootc", env: "container-ansible-core-2.17" } - - { image: "fedora-43-bootc", env: "container-ansible-core-2.19" } + # - { image: "centos-10", env: "container-ansible-core-2-17" } + - { image: "centos-10-bootc", env: "container-ansible-core-2-17" } + - { image: "fedora-42", env: "container-ansible-core-2-17" } + - { image: "fedora-43", env: "container-ansible-core-2-19" } + - { image: "fedora-42-bootc", env: "container-ansible-core-2-17" } + - { image: "fedora-43-bootc", env: "container-ansible-core-2-19" } env: TOX_ARGS: "--skip-tags tests::infiniband,tests::nvme,tests::scsi" @@ -110,7 +110,7 @@ jobs: python3 -m pip install --upgrade pip sudo apt update sudo apt install -y --no-install-recommends git ansible-core genisoimage qemu-system-x86 - pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.15.0" + pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.16.0" # HACK: Drop this when moving this workflow to 26.04 LTS - name: Update podman to 5.x for compatibility with bootc-image-builder's podman 5 diff --git a/contributing.md b/contributing.md index 8fa8d41dfd..01e57690f6 100644 --- a/contributing.md +++ b/contributing.md @@ -54,7 +54,7 @@ The latest version of tox-lsr supports qemu testing. you can use e.g. ```bash - tox -e qemu-ansible-core-2.14 -- --image-name centos-9 tests/tests_default.yml + tox -e qemu-ansible-core-2-20 -- --image-name centos-9 tests/tests_default.yml ``` There are many command line options and environment variables which can be used