Skip to content
/ os Public
forked from openshift/os

Commit

Permalink
ci/prow-entrypoint: Remove Secure Boot test workaround
Browse files Browse the repository at this point in the history
  • Loading branch information
travier committed Apr 17, 2024
1 parent 0d8d850 commit 23cec9b
Showing 1 changed file with 0 additions and 22 deletions.
22 changes: 0 additions & 22 deletions ci/prow-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -115,28 +115,6 @@ cosa_build() {
# Build QEMU image and run all kola tests
kola_test_qemu() {
cosa buildextend-qemu

# Skip Secure Boot tests on SCOS for now
# See: https://github.com/openshift/os/issues/1237
# Due to the changes in https://github.com/coreos/coreos-assembler/pull/3652
# 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 "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 "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
fi
fi
cosa kola run ${args} --parallel 2 --output-dir ${ARTIFACT_DIR:-/tmp}/kola
}

Expand Down

0 comments on commit 23cec9b

Please sign in to comment.