More robust filtering for unrecognized distros

in order to preserve the value `rhel-93` as unrecognized when
running on 9.2 nightly CI
This commit is contained in:
Alexander Todorov 2023-04-13 14:57:58 +03:00 committed by Alexander Todorov
parent 5cd73ad946
commit 0330e9c3e1

View file

@ -108,7 +108,12 @@ fi
# Filter out beta and centos-stream, see GH issue #2257
ALL_DISTROS=$(find "$REPO_PATH" -name '*.json' -printf '%P\n' | awk -F "." '{ print $1 }')
ALL_EXPECTED_DISTROS=$(echo "$ALL_DISTROS" | grep -E "$PATTERN" | grep -Ev 'beta|stream' | sort)
ALL_REMAINDERS=$(echo "$ALL_DISTROS" | grep -v "$RECOGNIZED_DISTROS")
# Warning: filter out the remaining distros by matching whole words to avoid matching
# the value rhel-93 by the pattern rhel-9!
# If we're running on a RHEL 9.2 osbuild-composer doesn't know anything about 9.3
# images so the value rhel-9.3 should be treated as unrecognized and error out as
# expected in the test snippet further below
ALL_REMAINDERS=$(echo "$ALL_DISTROS" | grep -vw "$RECOGNIZED_DISTROS")
# Check for any missing distros based on the expected host pattern
if [ "$ALL_EXPECTED_DISTROS" != "$INSTALLED_DISTROS" ];then