From 8a9e64819128c3c26d212731d16ca89b9150953b Mon Sep 17 00:00:00 2001 From: Vincent Shen Date: Mon, 5 Feb 2024 12:42:59 -0800 Subject: [PATCH] OCP: Fix e2e remediation for container_security_operator_exists We need to update the e2e remediation for container_security_operator_exists, so the CI works properly --- .../tests/ocp4/e2e-remediation.sh | 5 +++++ ocp-resources/e2e/container-security-operator-install.yaml | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/applications/openshift/risk-assessment/container_security_operator_exists/tests/ocp4/e2e-remediation.sh b/applications/openshift/risk-assessment/container_security_operator_exists/tests/ocp4/e2e-remediation.sh index 476b7d1a0d0..9dff2f18d56 100755 --- a/applications/openshift/risk-assessment/container_security_operator_exists/tests/ocp4/e2e-remediation.sh +++ b/applications/openshift/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 index f38663304a4..edece16b934 100644 --- 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