diff --git a/.github/workflows/isotovideo-action.yml b/.github/workflows/isotovideo-action.yml index 078798b..5dd6580 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=. + run: isotovideo qemu_no_kvm=1 casedir=$(pwd) - 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 ok || (echo "Test modules failed" && exit 1) diff --git a/.github/workflows/isotovideo-check-all-test-modules.yml b/.github/workflows/isotovideo-check-all-test-modules.yml index 4b61014..12da282 100644 --- a/.github/workflows/isotovideo-check-all-test-modules.yml +++ b/.github/workflows/isotovideo-check-all-test-modules.yml @@ -13,9 +13,9 @@ jobs: steps: - uses: actions/checkout@v2 - name: Run isotovideo against test code, fail if any test module failed - env: - image: registry.opensuse.org/devel/openqa/containers/isotovideo:qemu-x86-jq - isotovideo: isotovideo qemu_no_kvm=1 casedir=/tests - jq_filter: jq .result testresults/result-*.json - err_msg: Test modules failed - run: docker run --rm -it -v .:/tests:Z --entrypoint '' $image /bin/sh -c '$isotovideo && $jq_filter | grep ok || (echo "$err_msg" && 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 ok \ + || (echo "Test modules failed" && exit 1)' diff --git a/.github/workflows/isotovideo.yml b/.github/workflows/isotovideo.yml index a08209b..05b13ca 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 -it -v .:/tests:Z registry.opensuse.org/devel/openqa/containers/isotovideo:qemu-x86 qemu_no_kvm=1 casedir=/tests