Skip to content

Commit fc69b62

Browse files
richmmartinpitt
authored andcommitted
ci: bump tox-lsr to 3.8.0; rename qemu/kvm tests
This will make the qemu/kvm tests be tested in either ascending or descending ASCII order. This should give us better test coverage of clean up scenarios which may fail depending on the order of the previous tests. Rename the qemu/kvm tests so that the statuses are shorter and more intuitive. Improve qemu/kvm test failure error reporting. Signed-off-by: Rich Megginson <[email protected]>
1 parent 8909975 commit fc69b62

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

.github/workflows/ansible-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Install tox, tox-lsr
3333
run: |
3434
set -euxo pipefail
35-
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.7.0"
35+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.8.0"
3636
3737
- name: Convert role to collection format
3838
id: collection

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Install tox, tox-lsr
3131
run: |
3232
set -euxo pipefail
33-
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.7.0"
33+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.8.0"
3434
3535
- name: Run ansible-plugin-scan
3636
run: |

.github/workflows/ansible-test.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.7.0"
36+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.8.0"
3737
3838
- name: Convert role to collection format
3939
run: |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
tox=tox
6666
virtualenv=virtualenv
6767
fi
68-
pip install "$tox" "$virtualenv" "git+https://github.com/linux-system-roles/tox-lsr@3.7.0"
68+
pip install "$tox" "$virtualenv" "git+https://github.com/linux-system-roles/tox-lsr@3.8.0"
6969
# If you have additional OS dependency packages e.g. libcairo2-dev
7070
# then put them in .github/config/ubuntu-requirements.txt, one
7171
# package per line.

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
7171
# bootc build support (in buildah) has a separate flag
7272
if [ "${{ matrix.scenario.image }}" != "$image" ]; then
73-
if ! yq -e '.galaxy_info.galaxy_tags[] | select(. == "containerbuild")' meta/main.yml; then
73+
if ! yq -e '.galaxy_info.galaxy_tags[] | select(. == "containerbuild")' meta/main.yml; then
7474
supported=
7575
fi
7676
else
@@ -105,7 +105,7 @@ jobs:
105105
python3 -m pip install --upgrade pip
106106
sudo apt update
107107
sudo apt install -y --no-install-recommends git ansible-core genisoimage qemu-system-x86
108-
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.7.0"
108+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.8.0"
109109
110110
- name: Configure tox-lsr
111111
if: steps.check_platform.outputs.supported
@@ -115,8 +115,9 @@ jobs:
115115
116116
- name: Run qemu integration tests
117117
if: steps.check_platform.outputs.supported && startsWith(matrix.scenario.env, 'qemu')
118-
run: |
119-
tox -e ${{ matrix.scenario.env }} -- --image-name ${{ matrix.scenario.image }} --make-batch $TOX_ARGS --
118+
run: >-
119+
tox -e ${{ matrix.scenario.env }} -- --image-name ${{ matrix.scenario.image }} --make-batch
120+
--log-level=debug --skip-tags tests::infiniband,tests::nvme,tests::scsi --
120121
121122
- name: Qemu result summary
122123
if: steps.check_platform.outputs.supported && startsWith(matrix.scenario.env, 'qemu') && always()
@@ -175,7 +176,7 @@ jobs:
175176
run: |
176177
set -euo pipefail
177178
for f in tests/*.log; do
178-
if FAIL=$(grep -B100 -A30 "fatal:" "$f"); then
179+
if FAIL=$(grep -E -B100 -A30 "fatal:|An exception occurred" "$f"); then
179180
echo "::group::$(basename $f)"
180181
echo "$FAIL"
181182
echo "::endgroup::"

0 commit comments

Comments
 (0)