Merge pull request ComplianceAsCode#11545 from ComplianceAsCode/conta…

…iner_security OCP: Fix e2e remediation for container_security_operator_exists
a-skr · Feb 13, 2024 · b537a33 · b537a33
2 parents 4539cdd + 8a9e648
commit b537a33
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/...penshift/risk-assessment/container_security_operator_exists/tests/ocp4/e2e-remediation.sh b/...penshift/risk-assessment/container_security_operator_exists/tests/ocp4/e2e-remediation.sh
@@ -14,3 +14,8 @@ done
 echo "waiting for container-security-operator deployment to be ready"
 oc wait -nopenshift-operators --for=condition=Available  --timeout=300s \
     deployment/container-security-operator
+
+echo "waiting the subscription to have .status.installedCSV"
+while [ -z "$(oc get subscription container-security-operator -nopenshift-operators -o jsonpath='{.status.installedCSV}')" ]; do
+    sleep 3
+done
diff --git a/ocp-resources/e2e/container-security-operator-install.yaml b/ocp-resources/e2e/container-security-operator-install.yaml
@@ -7,9 +7,9 @@ metadata:
   name: container-security-operator
   namespace: openshift-operators
 spec:
-  channel: stable-3.8
+  channel: stable-3.10
   installPlanApproval: Automatic
   name: container-security-operator
   source: redhat-operators
   sourceNamespace: openshift-marketplace
-  startingCSV: container-security-operator.v3.8.2
+  startingCSV: container-security-operator.v3.10.3