Fix race condition in e2e compliance test setup

guzalv · claude · guzalv · commit 39dc3c5d1784 · 2026-04-08T11:22:34.000+02:00
Problem: The install_e2e_compliance_resources() function was creating a TailoredProfile immediately after creating the CustomRule it references, without waiting for the CustomRule to be processed by the compliance operator. This caused a race condition where the TailoredProfile could fail to reach READY state if the CustomRule wasn't validated yet. Solution: Add a wait loop after creating the CustomRule to ensure it exists and give the compliance operator time to process it (10 seconds) before creating the TailoredProfile. Also improved error reporting to show the TailoredProfile's error message and current state during the wait loop. The e2e-tailored-profile.yaml references check-cm-marker CustomRule in its enableRules, so the CustomRule must be ready before the TailoredProfile can be validated successfully. Fixes: #19880 CI failure in ocp-4-21-compliance-e2e-tests Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
diff --git a/tests/e2e/lib.sh b/tests/e2e/lib.sh
@@ -563,8 +563,22 @@ install_the_compliance_operator() {
 install_e2e_compliance_resources() {
     info "Installing e2e custom rule and tailored profile"
     oc apply -f "${ROOT}/tests/e2e/yaml/compliance-operator/e2e-custom-rule.yaml"
+
+    # Wait for CustomRule to exist and give compliance operator time to process it
+    info "Waiting for CustomRule check-cm-marker to be created and processed..."
+    local retries=30
+    for i in $(seq 1 $retries); do
+        if oc get customrule check-cm-marker -n openshift-compliance &>/dev/null; then
+            info "CustomRule check-cm-marker exists, waiting for compliance operator to process it"
+            sleep 10
+            break
+        fi
+        sleep 5
+    done
+
     oc apply -f "${ROOT}/tests/e2e/yaml/compliance-operator/e2e-tailored-profile.yaml"
-    # Wait for TP to become READY
+
+    # Wait for TP to become READY with better error reporting
     local retries=30
     for i in $(seq 1 $retries); do
         state=$(oc get tailoredprofile e2e-tailored-profile -n openshift-compliance \
@@ -573,9 +587,15 @@ install_e2e_compliance_resources() {
             info "TailoredProfile e2e-tailored-profile is READY"
             return
         fi
+        if [[ "$state" == "ERROR" ]]; then
+            error_msg=$(oc get tailoredprofile e2e-tailored-profile -n openshift-compliance \
+                -o jsonpath='{.status.errorMessage}' 2>/dev/null || true)
+            die "TailoredProfile e2e-tailored-profile is in ERROR state: $error_msg"
+        fi
+        info "Waiting for TailoredProfile (attempt $i/$retries, current state: $state)"
         sleep 5
     done
-    die "TailoredProfile e2e-tailored-profile did not become READY"
+    die "TailoredProfile e2e-tailored-profile did not become READY after ${retries} attempts"
 }
 
 setup_client_CA_auth_provider() {
