Skip to content

Commit f60df3a

Browse files
committed
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 <rmeggins@redhat.com>
1 parent 7a554a7 commit f60df3a

File tree

5 files changed

+6
-8
lines changed

5 files changed

+6
-8
lines changed

.github/workflows/ansible-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Install tox, tox-lsr
3636
run: |
3737
set -euxo pipefail
38-
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.17.0"
38+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.17.1"
3939
4040
- name: Convert role to collection format
4141
id: collection

.github/workflows/ansible-managed-var-comment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Install tox, tox-lsr
3434
run: |
3535
set -euxo pipefail
36-
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.17.0"
36+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.17.1"
3737
3838
- name: Run ansible-plugin-scan
3939
run: |

.github/workflows/ansible-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Install tox, tox-lsr
3737
run: |
3838
set -euxo pipefail
39-
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.17.0"
39+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.17.1"
4040
4141
- name: Convert role to collection format
4242
run: |

.github/workflows/python-unit-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
run: |
9797
set -euxo pipefail
9898
python -m pip install --upgrade pip
99-
pip install "git+https://github.com/linux-system-roles/tox-lsr@3.17.0"
99+
pip install "git+https://github.com/linux-system-roles/tox-lsr@3.17.1"
100100
# If you have additional OS dependency packages e.g. libcairo2-dev
101101
# then put them in .github/config/ubuntu-requirements.txt, one
102102
# package per line.

.github/workflows/qemu-kvm-integration-tests.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
7676
# bootc build support (in buildah) has a separate flag
7777
if [ "${{ matrix.scenario.image }}" != "$image" ]; then
78-
if ! yq -e '.galaxy_info.galaxy_tags[] | select(. == "containerbuild")' meta/main.yml; then
78+
if ! yq -e '.galaxy_info.galaxy_tags[] | select(. == "containerbuild")' meta/main.yml; then
7979
supported=
8080
fi
8181
else
@@ -110,7 +110,7 @@ jobs:
110110
python3 -m pip install --upgrade pip
111111
sudo apt update
112112
sudo apt install -y --no-install-recommends git ansible-core genisoimage qemu-system-x86
113-
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.17.0"
113+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.17.1"
114114
115115
# HACK: Drop this when moving this workflow to 26.04 LTS
116116
- name: Update podman to 5.x for compatibility with bootc-image-builder's podman 5
@@ -178,7 +178,6 @@ jobs:
178178
rc=0
179179
# we cannot skip these on the first test
180180
export SKIP_REQUIREMENTS=false
181-
export SKIP_CALLBACK_PLUGINS=false
182181
for t in tests/tests_*.yml; do
183182
if tox -e ${{ matrix.scenario.env }} -- --image-name ${{ matrix.scenario.image }} $t > ${t}.log 2>&1; then
184183
echo "PASS: $(basename $t)"
@@ -190,7 +189,6 @@ jobs:
190189
fi
191190
# we can skip these on subsequent runs
192191
export SKIP_REQUIREMENTS=true
193-
export SKIP_CALLBACK_PLUGINS=true
194192
done
195193
exit $rc
196194

0 commit comments

Comments
 (0)