From 22bbfc783f60bdb3c89298801f6a46de2d748ffa Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Wed, 7 May 2025 11:13:19 -0600 Subject: [PATCH] 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 --- .github/workflows/ansible-lint.yml | 2 +- .github/workflows/ansible-managed-var-comment.yml | 2 +- .github/workflows/ansible-test.yml | 2 +- .github/workflows/python-unit-test.yml | 2 +- .github/workflows/qemu-kvm-integration-tests.yml | 11 ++++++----- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ansible-lint.yml b/.github/workflows/ansible-lint.yml index e325719..eb5e0d8 100644 --- a/.github/workflows/ansible-lint.yml +++ b/.github/workflows/ansible-lint.yml @@ -32,7 +32,7 @@ jobs: - name: Install tox, tox-lsr run: | set -euxo pipefail - pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.7.0" + pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.8.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 a2e4bbb..ea68dfc 100644 --- a/.github/workflows/ansible-managed-var-comment.yml +++ b/.github/workflows/ansible-managed-var-comment.yml @@ -30,7 +30,7 @@ jobs: - name: Install tox, tox-lsr run: | set -euxo pipefail - pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.7.0" + pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.8.0" - name: Run ansible-plugin-scan run: | diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index bc8d5cf..f86338e 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.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.7.0" + pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.8.0" - name: Convert role to collection format run: | diff --git a/.github/workflows/python-unit-test.yml b/.github/workflows/python-unit-test.yml index b46ea25..0a0350c 100644 --- a/.github/workflows/python-unit-test.yml +++ b/.github/workflows/python-unit-test.yml @@ -65,7 +65,7 @@ jobs: tox=tox virtualenv=virtualenv fi - pip install "$tox" "$virtualenv" "git+https://github.com/linux-system-roles/tox-lsr@3.7.0" + pip install "$tox" "$virtualenv" "git+https://github.com/linux-system-roles/tox-lsr@3.8.0" # If you have additional OS dependency packages e.g. libcairo2-dev # then put them in .github/config/ubuntu-requirements.txt, one # package per line. diff --git a/.github/workflows/qemu-kvm-integration-tests.yml b/.github/workflows/qemu-kvm-integration-tests.yml index c7149d2..5cdf7d6 100644 --- a/.github/workflows/qemu-kvm-integration-tests.yml +++ b/.github/workflows/qemu-kvm-integration-tests.yml @@ -70,7 +70,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 @@ -105,7 +105,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.7.0" + pip3 install "git+https://github.com/linux-system-roles/tox-lsr@3.8.0" - name: Configure tox-lsr if: steps.check_platform.outputs.supported @@ -115,8 +115,9 @@ jobs: - name: Run qemu integration tests if: steps.check_platform.outputs.supported && startsWith(matrix.scenario.env, 'qemu') - run: | - tox -e ${{ matrix.scenario.env }} -- --image-name ${{ matrix.scenario.image }} --make-batch $TOX_ARGS -- + run: >- + tox -e ${{ matrix.scenario.env }} -- --image-name ${{ matrix.scenario.image }} --make-batch + --log-level=debug --skip-tags tests::infiniband,tests::nvme,tests::scsi -- - name: Qemu result summary if: steps.check_platform.outputs.supported && startsWith(matrix.scenario.env, 'qemu') && always() @@ -175,7 +176,7 @@ jobs: run: | set -euo pipefail for f in tests/*.log; do - if FAIL=$(grep -B100 -A30 "fatal:" "$f"); then + if FAIL=$(grep -E -B100 -A30 "fatal:|An exception occurred" "$f"); then echo "::group::$(basename $f)" echo "$FAIL" echo "::endgroup::"