From c67add4a6e48298a50dfec5bb9df79d24aaa3f58 Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Thu, 22 Feb 2024 10:03:45 +0200 Subject: [PATCH] Skip image types already covered in vmware.sh namely ova-boot|vmdk-boot --- test/cases/image_tests.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/test/cases/image_tests.sh b/test/cases/image_tests.sh index 6436f9c33..d23d36f86 100755 --- a/test/cases/image_tests.sh +++ b/test/cases/image_tests.sh @@ -59,12 +59,9 @@ get_test_cases () { SKIP_CASES=("${SKIP_OSTREE[@]}") fi - if nvrGreaterOrEqual "osbuild-composer" "84"; then - echo - else - SKIP_OVA=$(grep ova-boot <<< "$ALL_CASES" || echo -n) - SKIP_CASES=("${SKIP_CASES[@]}" "$SKIP_OVA") - fi + # skip image types covered in vmware.sh + SKIP_OVA=$(grep -E 'ova-boot|vmdk-boot' <<< "$ALL_CASES" || echo -n) + SKIP_CASES=("${SKIP_CASES[@]}" "${SKIP_OVA[@]}") # skip image types already covered in osbuild/images repository # see https://issues.redhat.com/browse/COMPOSER-2127