diff --git a/ci/prow-entrypoint.sh b/ci/prow-entrypoint.sh index 61a0bb59..74b7e4fb 100755 --- a/ci/prow-entrypoint.sh +++ b/ci/prow-entrypoint.sh @@ -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 }