From dd68b9b0e46801da54c426cea5e8266c668bcbdb Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Fri, 13 Mar 2026 09:27:06 -0600 Subject: [PATCH] ci: tox-lsr 3.17.1 - previous update broke container tests, this fixes them [citest_skip] tox-lsr 3.17.1 has a fix for the broken container tests There was one shell function for both setting up the callback plugins and the connection plugin. When this function was skipped, the ANSIBLE_CONNECTION_PLUGINS environment variable was not set, so all subsequent tests failed. The connection plugin must be present and the env. var. must be set in order to run any container tests. The code was fixed to ensure that there is always a connection plugin installed in the correct location and that ANSIBLE_CONNECTION_PLUGINS is always set and contains this path. Also, setting up the callback plugins and the connection plugin is already idempotent, so no reason to skip them. Signed-off-by: Rich Megginson --- .github/workflows/ansible-lint.yml | 2 +- .github/workflows/ansible-managed-var-comment.yml | 2 +- .github/workflows/ansible-test.yml | 2 +- .github/workflows/qemu-kvm-integration-tests.yml | 6 ++---- meta/collection-requirements.yml | 2 ++ 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ansible-lint.yml b/.github/workflows/ansible-lint.yml index 91ac33950b..b64f48e6a5 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.17.0" + pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.17.1" - 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 8a9688baf3..5d408f6fd1 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.17.0" + pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.17.1" - name: Run ansible-plugin-scan run: | diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index 3a4b240281..2df187a2af 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.17.0" + pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.17.1" - 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 4ebb8e8841..2bcb450332 100644 --- a/.github/workflows/qemu-kvm-integration-tests.yml +++ b/.github/workflows/qemu-kvm-integration-tests.yml @@ -75,7 +75,7 @@ jobs: # bootc build support (in buildah) has a separate flag if [ "${{ matrix.scenario.image }}" != "$image" ]; then - if ! yq -e '.galaxy_info.galaxy_tags[] | select(. == "containerbuild")' meta/main.yml; then + if ! yq -e '.galaxy_info.galaxy_tags[] | select(. == "containerbuild")' meta/main.yml; then supported= fi else @@ -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.17.0" + pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.17.1" # 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 @@ -178,7 +178,6 @@ jobs: rc=0 # we cannot skip these on the first test export SKIP_REQUIREMENTS=false - export SKIP_CALLBACK_PLUGINS=false for t in tests/tests_*.yml; do if tox -e ${{ matrix.scenario.env }} -- --image-name ${{ matrix.scenario.image }} $t > ${t}.log 2>&1; then echo "PASS: $(basename $t)" @@ -190,7 +189,6 @@ jobs: fi # we can skip these on subsequent runs export SKIP_REQUIREMENTS=true - export SKIP_CALLBACK_PLUGINS=true done exit $rc diff --git a/meta/collection-requirements.yml b/meta/collection-requirements.yml index bf55689889..397dab6660 100644 --- a/meta/collection-requirements.yml +++ b/meta/collection-requirements.yml @@ -3,3 +3,5 @@ collections: - name: ansible.posix - name: fedora.linux_system_roles + - name: community.general + version: '>=6.6.0,<12.0.0'