Skip to content

Commit

Permalink
Merge pull request #1478 from travier/main-ci-fix-centos-release-pkg-…
Browse files Browse the repository at this point in the history
…name

NO-JIRA: ci: Gate secure boot tests on centos-stream-release
  • Loading branch information
openshift-merge-bot[bot] authored Apr 10, 2024
2 parents 8f8cb93 + b6c37d1 commit 94146f6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
8 changes: 6 additions & 2 deletions ci/prow-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,16 @@ kola_test_qemu() {
# we need to check if the basic.nvme is available in the list of tests
local args=""
local manifest="src/config/manifest.yaml"
if [[ -f "src/config.json" ]]; then
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-release"; then
if rpm-ostree compose tree --print-only "${manifest}" | jq -r '.packages[]' | grep -q "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-release"; then
if ! rpm-ostree compose tree --print-only "${manifest}" | jq -r '.packages[]' | grep -q "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
2 changes: 1 addition & 1 deletion manifest-c9s.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ postprocess:
packages:
# We include the generic release package and tweak the os-release info in a
# post-proces script
- centos-release
- centos-stream-release
# RPM GPG keys for CentOS SIG repos
- centos-release-cloud-common
- centos-release-nfv-common
Expand Down

0 comments on commit 94146f6

Please sign in to comment.