Skip to content

Commit

Permalink
Merge pull request #1485 from jlebon/pr/grep-q
Browse files Browse the repository at this point in the history
NO-JIRA: ci/prow-entrypoint.sh: don't use `grep -q` at the end of pipeline
  • Loading branch information
openshift-merge-bot[bot] authored Apr 15, 2024
2 parents d35fed3 + 3459323 commit e189ca8
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions ci/prow-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,12 @@ kola_test_qemu() {
variant="$(jq --raw-output '."coreos-assembler.config-variant"' 'src/config.json')"
manifest="src/config/manifest-${variant}.yaml"
fi
if cosa kola list --json | jq -r '.[].Name' | grep -q "basic.nvme"; then
if rpm-ostree compose tree --print-only "${manifest}" | jq -r '.packages[]' | grep -q "centos-stream-release"; then
if cosa kola list --json | jq -r '.[].Name' | grep "basic.nvme"; then
if rpm-ostree compose tree --print-only "${manifest}" | jq -r '.packages[]' | grep "centos-stream-release"; then
args+="--denylist-test *.uefi-secure"
fi
else
if ! rpm-ostree compose tree --print-only "${manifest}" | jq -r '.packages[]' | grep -q "centos-stream-release"; then
if ! rpm-ostree compose tree --print-only "${manifest}" | jq -r '.packages[]' | grep "centos-stream-release"; then
cosa kola --basic-qemu-scenarios --output-dir ${ARTIFACT_DIR:-/tmp}/kola-basic
else
cosa kola --basic-qemu-scenarios --skip-secure-boot --output-dir ${ARTIFACT_DIR:-/tmp}/kola-basic
Expand Down

0 comments on commit e189ca8

Please sign in to comment.