From 2115edc598ba1e2d344ed8881ce765a4d6b4fbac Mon Sep 17 00:00:00 2001
From: Michael Armijo <marmijo@redhat.com>
Date: Tue, 31 Mar 2026 16:40:21 -0600
Subject: [PATCH 1/2] rhaos-pkgs-match-openshift: exclude known package
 mismatches

Introduce `RHAOS_PACKAGE_EXCEPTIONS` and build a regex from it to filter
out packages that are known to not match the target version of
openshift. Use a list-based structure so additional packages can be
excluded in the future by appending to the exception array.

Exclude the toolbox rhaos package, which is known to not match the
target version of openshift.

Also remove the rhaos-pkgs-match-openshift test from the denylist.

See: #1847

This backports https://github.com/openshift/os/commit/ef8a3bbd2f960958b36b64854d2ae5ad3c4b16a9
and part of https://github.com/openshift/os/commit/3f11128fec34427d47cb4b07e290ec90646e3719
---
 kola-denylist.yaml                            |  2 --
 tests/kola/version/rhaos-pkgs-match-openshift | 16 +++++++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/kola-denylist.yaml b/kola-denylist.yaml
index a6c981ef1..d4ab1a23a 100644
--- a/kola-denylist.yaml
+++ b/kola-denylist.yaml
@@ -2,5 +2,3 @@
 # coreos-assembler to automatically skip some tests. For more information,
 # see: https://github.com/coreos/coreos-assembler/pull/866.
 
-- pattern: ext.config.version.rhaos-pkgs-match-openshift
-  tracker: https://github.com/openshift/os/issues/1847
diff --git a/tests/kola/version/rhaos-pkgs-match-openshift b/tests/kola/version/rhaos-pkgs-match-openshift
index 21e64dad0..93c33cc86 100755
--- a/tests/kola/version/rhaos-pkgs-match-openshift
+++ b/tests/kola/version/rhaos-pkgs-match-openshift
@@ -12,7 +12,21 @@ set -xeuo pipefail
 # source the environment variables to get OPENSHIFT_VERSION
 source /etc/os-release
 
-rpm -qa | grep "rhaos" > /tmp/rhaos-packages.txt
+# These are packages that are known to not match the
+# targeted version of openshift. Exlude them from the test.
+RHAOS_PACKAGE_EXCEPTIONS=(
+    # toolbox doesn't always match the target ocp version because it
+    # is included in the base-image which spans multiple versions
+    toolbox
+    # conmon currently is missing 4.19+ vesions of the package
+    conmon-rs
+)
+
+exception_pattern=$(echo ${RHAOS_PACKAGE_EXCEPTIONS[@]} | tr " " "|")
+
+# Use `|| true` here to allow situations where RHAOS_PACKAGE_EXCEPTIONS contains every
+# rhaos package in the image, which would otherwise cause `grep -Ev` to fail the test.
+rpm -qa | grep "rhaos" | grep -Ev "${exception_pattern}" > /tmp/rhaos-packages.txt || true
 
 if grep -v "rhaos${OPENSHIFT_VERSION}" /tmp/rhaos-packages.txt; then
     fatal "Error: rhaos packages do not match OpenShift version"

From da9d3eaded06a82783fda6a7f7a02a104887ce0a Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Fri, 27 Feb 2026 09:01:42 -0500
Subject: [PATCH 2/2] tests: add openshift tag

The build-node-image job only tests tags with the openshift tag
and any tests still in this repo should be running so let's add
the openshift tag to them.
---
 tests/kola/version/rhaos-pkgs-match-openshift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/kola/version/rhaos-pkgs-match-openshift b/tests/kola/version/rhaos-pkgs-match-openshift
index 93c33cc86..4c6b811ea 100755
--- a/tests/kola/version/rhaos-pkgs-match-openshift
+++ b/tests/kola/version/rhaos-pkgs-match-openshift
@@ -4,6 +4,7 @@
 ##   description: Verify that packages coming from the rhaos
 ##     branches match the OpenShift version.
 ##     This is RHCOS only.
+##   tags: openshift
 
 set -xeuo pipefail