Skip to content

Commit

Permalink
Fix isotovideo CI jobs
Browse files Browse the repository at this point in the history
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 <ybonatakis@suse.com>
  • Loading branch information
b10n1k committed Feb 8, 2024
1 parent 4d56c6d commit 3946b97
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 11 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/isotovideo-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
12 changes: 6 additions & 6 deletions .github/workflows/isotovideo-check-all-test-modules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
2 changes: 1 addition & 1 deletion .github/workflows/isotovideo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 3946b97

Please sign in to comment.