Skip to content

Commit 7a554a7

Browse files
committed
ci: tox-lsr 3.17.0 - container test improvements, use ansible 2.20 for fedora 43 [citest_skip]
tox-lsr 3.17.0 has some container test improvements - better output, faster runs Use Ansible 2.20 for qemu/container tests on fedora 43 Signed-off-by: Rich Megginson <rmeggins@redhat.com>
1 parent fb48623 commit 7a554a7

File tree

5 files changed

+14
-11
lines changed

5 files changed

+14
-11
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.16.0"
38+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.17.0"
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.16.0"
36+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.17.0"
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.16.0"
39+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.17.0"
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.16.0"
99+
pip install "git+https://github.com/linux-system-roles/tox-lsr@3.17.0"
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: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- { image: "centos-9", env: "qemu-ansible-core-2-16" }
3232
- { image: "centos-10", env: "qemu-ansible-core-2-17" }
3333
- { image: "fedora-42", env: "qemu-ansible-core-2-19" }
34-
- { image: "fedora-43", env: "qemu-ansible-core-2-19" }
34+
- { image: "fedora-43", env: "qemu-ansible-core-2-20" }
3535
- { image: "leap-15.6", env: "qemu-ansible-core-2-18" }
3636

3737
# container
@@ -41,9 +41,9 @@ jobs:
4141
# - { image: "centos-10", env: "container-ansible-core-2-17" }
4242
- { image: "centos-10-bootc", env: "container-ansible-core-2-17" }
4343
- { image: "fedora-42", env: "container-ansible-core-2-17" }
44-
- { image: "fedora-43", env: "container-ansible-core-2-19" }
44+
- { image: "fedora-43", env: "container-ansible-core-2-20" }
4545
- { image: "fedora-42-bootc", env: "container-ansible-core-2-17" }
46-
- { image: "fedora-43-bootc", env: "container-ansible-core-2-19" }
46+
- { image: "fedora-43-bootc", env: "container-ansible-core-2-20" }
4747

4848
env:
4949
TOX_ARGS: "--skip-tags tests::infiniband,tests::nvme,tests::scsi"
@@ -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.16.0"
113+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.17.0"
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
@@ -175,10 +175,10 @@ jobs:
175175
if: steps.check_platform.outputs.supported && startsWith(matrix.scenario.env, 'container')
176176
run: |
177177
set -euo pipefail
178-
# HACK: debug.py/profile.py setup is broken
179-
export LSR_CONTAINER_PROFILE=false
180-
export LSR_CONTAINER_PRETTY=false
181178
rc=0
179+
# we cannot skip these on the first test
180+
export SKIP_REQUIREMENTS=false
181+
export SKIP_CALLBACK_PLUGINS=false
182182
for t in tests/tests_*.yml; do
183183
if tox -e ${{ matrix.scenario.env }} -- --image-name ${{ matrix.scenario.image }} $t > ${t}.log 2>&1; then
184184
echo "PASS: $(basename $t)"
@@ -188,6 +188,9 @@ jobs:
188188
mv "${t}.log" "${t}-FAIL.log"
189189
rc=1
190190
fi
191+
# we can skip these on subsequent runs
192+
export SKIP_REQUIREMENTS=true
193+
export SKIP_CALLBACK_PLUGINS=true
191194
done
192195
exit $rc
193196

0 commit comments

Comments
 (0)