From 8e6ab39e535d8a6295e8488903d79fbe00cb656f Mon Sep 17 00:00:00 2001 From: ybonatakis Date: Thu, 8 Feb 2024 15:29:18 +0100 Subject: [PATCH] Fix isotovideo CI jobs isotovideo-action.yml uses a isotovideo version with already jq installed. fixed grep which excluded the expected output in success and changed logical and to logical or, which will reached when grep fails. Signed-off-by: ybonatakis --- .github/workflows/isotovideo-action.yml | 4 +--- .github/workflows/isotovideo-check-all-test-modules.yml | 7 ++++++- .github/workflows/isotovideo.yml | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/isotovideo-action.yml b/.github/workflows/isotovideo-action.yml index 078798b..d023f69 100644 --- a/.github/workflows/isotovideo-action.yml +++ b/.github/workflows/isotovideo-action.yml @@ -9,11 +9,9 @@ jobs: image: "registry.opensuse.org/devel/openqa/containers/isotovideo:qemu-x86-jq" steps: - uses: actions/checkout@v2 - - name: install jq - run: zypper -n in jq - name: Run isotovideo against test code run: isotovideo qemu_no_kvm=1 casedir=. - name: fail if any test module failed - run: jq .result testresults/result-*.json | grep -v ok && echo "Test modules failed" && exit 1 + run: jq .result testresults/result-*.json | grep -v ok && { echo "Test modules failed" && exit 1 ;} || true diff --git a/.github/workflows/isotovideo-check-all-test-modules.yml b/.github/workflows/isotovideo-check-all-test-modules.yml index ee4ab09..eda73ef 100644 --- a/.github/workflows/isotovideo-check-all-test-modules.yml +++ b/.github/workflows/isotovideo-check-all-test-modules.yml @@ -13,4 +13,9 @@ jobs: steps: - uses: actions/checkout@v2 - name: Run isotovideo against test code, fail if any test module failed - run: podman run --rm -it -v .:/tests:Z --entrypoint '' registry.opensuse.org/devel/openqa/containers/isotovideo:qemu-x86-jq /bin/sh -c 'isotovideo qemu_no_kvm=1 casedir=/tests && jq .result testresults/result-*.json | grep -v ok && echo "Test modules failed" && exit 1' + run: | + docker run --rm -v .:/tests:Z --entrypoint '' \ + registry.opensuse.org/devel/openqa/containers/isotovideo:qemu-x86-jq /bin/sh \ + -c 'isotovideo qemu_no_kvm=1 casedir=/tests \ + && jq .result testresults/result-*.json | grep -v ok \ + && { echo "Test modules failed" && exit 1; } || true' diff --git a/.github/workflows/isotovideo.yml b/.github/workflows/isotovideo.yml index a08209b..480dbcf 100644 --- a/.github/workflows/isotovideo.yml +++ b/.github/workflows/isotovideo.yml @@ -8,4 +8,4 @@ jobs: steps: - uses: actions/checkout@v2 - name: Run isotovideo against test code in happy-path scenario - run: podman run --rm -it -v .:/tests:Z registry.opensuse.org/devel/openqa/containers/isotovideo:qemu-x86 qemu_no_kvm=1 casedir=/tests + run: docker run --rm -v .:/tests:Z registry.opensuse.org/devel/openqa/containers/isotovideo:qemu-x86 qemu_no_kvm=1 casedir=/tests