From b393a54f5138fb46393632eb7f7ae145a1dfc09a Mon Sep 17 00:00:00 2001
From: Matthew Burket <mburket@redhat.com>
Date: Mon, 1 Jul 2024 19:39:25 -0500
Subject: [PATCH 1/3] Expand the cce_avail_check to ocp4

---
 tests/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8786f446d8a..3029d74cb6c 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -333,7 +333,7 @@ macro(cce_avail_check TEST_NAME_SUFFIX PRODUCTS CCE_LIST_PATH)
     endif()
 endmacro()
 
-cce_avail_check("rhel-all" "rhel8,rhel9,rhel10" "${CMAKE_SOURCE_DIR}/shared/references/cce-redhat-avail.txt")
+cce_avail_check("redhat-all" "ocp4,rhel8,rhel9,rhel10" "${CMAKE_SOURCE_DIR}/shared/references/cce-redhat-avail.txt")
 cce_avail_check("sle12" "sle12" "${CMAKE_SOURCE_DIR}/shared/references/cce-sle12-avail.txt")
 cce_avail_check("sle15" "sle15" "${CMAKE_SOURCE_DIR}/shared/references/cce-sle15-avail.txt")
 

From 1e696416eac70bf65926ebea55aaf819bd1397d6 Mon Sep 17 00:00:00 2001
From: Matthew Burket <mburket@redhat.com>
Date: Mon, 8 Jul 2024 08:56:41 -0500
Subject: [PATCH 2/3] Remove the CCEs that OCP4 is using

---
 shared/references/cce-redhat-avail.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/shared/references/cce-redhat-avail.txt b/shared/references/cce-redhat-avail.txt
index c463f177c33..ae142b7c7d7 100644
--- a/shared/references/cce-redhat-avail.txt
+++ b/shared/references/cce-redhat-avail.txt
@@ -2556,7 +2556,8 @@ CCE-90604-0
 CCE-90605-7
 CCE-90606-5
 CCE-90607-3
-CCE-90614-9
+CCE-90608-1
+CCE-90611-5
 CCE-90616-4
 CCE-90617-2
 CCE-90618-0

From 5aaff6f9602ab126546d59d842673978c30075e1 Mon Sep 17 00:00:00 2001
From: Matthew Burket <mburket@redhat.com>
Date: Mon, 8 Jul 2024 11:30:44 -0500
Subject: [PATCH 3/3] Clean up Red Hat CCE file

---
 shared/references/cce-redhat-avail.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/shared/references/cce-redhat-avail.txt b/shared/references/cce-redhat-avail.txt
index ae142b7c7d7..0881acb0fb3 100644
--- a/shared/references/cce-redhat-avail.txt
+++ b/shared/references/cce-redhat-avail.txt
@@ -2556,8 +2556,6 @@ CCE-90604-0
 CCE-90605-7
 CCE-90606-5
 CCE-90607-3
-CCE-90608-1
-CCE-90611-5
 CCE-90616-4
 CCE-90617-2
 CCE-90618-0