diff --git a/.github/workflows/ansible-lint.yml b/.github/workflows/ansible-lint.yml index 98e7bbc..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.1" + 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 55280b1..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.1" + 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 2ffd1d9..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.1" + 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/qemu-kvm-integration-tests.yml b/.github/workflows/qemu-kvm-integration-tests.yml index ff6fdd9..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.1" + 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() @@ -149,9 +150,9 @@ jobs: rc=0 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 "$(basename $t): pass" + echo "PASS: $(basename $t)" else - echo "$(basename $t): FAIL" + echo "FAIL: $(basename $t)" rc=1 fi done @@ -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::"