Merge pull request #1456 from c4rt0/pr/rhaos-pkgs-match-openshift

COS-2613: kola: fix rhaos-pkgs-match-openshift
openshift · Apr 30, 2024 · d682302 · d682302
2 parents 5d435fc + 219d60f
commit d682302
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/tests/kola/version/rhaos-pkgs-match-openshift b/tests/kola/version/rhaos-pkgs-match-openshift
@@ -9,6 +9,11 @@ set -xeuo pipefail
 
 . $KOLA_EXT_DATA/commonlib.sh
 
-if [[ $(rpm -qa | grep rhaos | grep -v $OPENSHIFT_VERSION) ]]; then
+# source the environment variables to get OPENSHIFT_VERSION
+source /etc/os-release
+
+rpm -qa | grep "rhaos" > /tmp/rhaos-packages.txt
+
+if grep -v "rhaos${OPENSHIFT_VERSION}" /tmp/rhaos-packages.txt; then
     fatal "Error: rhaos packages do not match OpenShift version"
 fi