diff --git a/applications/openshift/api-server/audit_log_forwarding_enabled/tests/ocp4/e2e-remediation.sh b/applications/openshift/api-server/audit_log_forwarding_enabled/tests/ocp4/e2e-remediation.sh index c3abb77af55..239f8351d9a 100755 --- a/applications/openshift/api-server/audit_log_forwarding_enabled/tests/ocp4/e2e-remediation.sh +++ b/applications/openshift/api-server/audit_log_forwarding_enabled/tests/ocp4/e2e-remediation.sh @@ -1,20 +1,18 @@ #!/bin/bash set -xe -ocp_version=$(oc version -ojson | jq -r '.openshiftVersion') -clo_v6_available_from="4.14.0" +export CLO_CHANNEL=$(oc get packagemanifest -o jsonpath='{range .status.channels[*]}{.name}{"\n"}{end}' -n openshift-marketplace cluster-logging | sort | tail -1) -if [ "$(printf '%s\n' "$ocp_version" "$clo_v6_available_from" | sort -V | head -n1)" = "$clo_v6_available_from" ]; then +if [ "${CLO_CHANNEL}" =~ stable-6\.* ]; then echo "OCP ${ocp_version} has CLO 6.0 is available for install"; install_v6=true fi +echo "installing cluster-logging-operator from channel ${CLO_CHANNEL}" if [ "$install_v6" = true ] ; then - echo "installing cluster-logging-operator V6.0" - oc apply -f ${ROOT_DIR}/ocp-resources/e2e/cluster-logging-install-observability.yaml + envsubst < <(cat ${ROOT_DIR}/ocp-resources/e2e/cluster-logging-install-observability.yaml) | oc apply -f else - echo "installing cluster-logging-operator" - oc apply -f ${ROOT_DIR}/ocp-resources/e2e/cluster-logging-install.yaml + envsusbst < <(cat ${ROOT_DIR}/ocp-resources/e2e/cluster-logging-install.yaml) | oc apply -f fi sleep 30 diff --git a/applications/openshift/api-server/audit_log_forwarding_enabled_logging_api/tests/ocp4/e2e-remediation.sh b/applications/openshift/api-server/audit_log_forwarding_enabled_logging_api/tests/ocp4/e2e-remediation.sh index db18099e312..bad94d8bf92 100755 --- a/applications/openshift/api-server/audit_log_forwarding_enabled_logging_api/tests/ocp4/e2e-remediation.sh +++ b/applications/openshift/api-server/audit_log_forwarding_enabled_logging_api/tests/ocp4/e2e-remediation.sh @@ -1,8 +1,10 @@ #!/bin/bash set -xe -echo "installing cluster-logging-operator" -oc apply -f ${ROOT_DIR}/ocp-resources/e2e/cluster-logging-install.yaml +export CLO_CHANNEL=$(oc get packagemanifest -o jsonpath='{range .status.channels[*]}{.name}{"\n"}{end}' -n openshift-marketplace cluster-logging | sort | tail -1) + +echo "installing cluster-logging-operator from channel ${CLO_CHANNEL}" +envsusbst < <(cat ${ROOT_DIR}/ocp-resources/e2e/cluster-logging-install.yaml) | oc apply -f sleep 30 diff --git a/ocp-resources/e2e/cluster-logging-install-observability.yaml b/ocp-resources/e2e/cluster-logging-install-observability.yaml index 61e1f90d5be..90ceb36c206 100644 --- a/ocp-resources/e2e/cluster-logging-install-observability.yaml +++ b/ocp-resources/e2e/cluster-logging-install-observability.yaml @@ -50,7 +50,7 @@ metadata: name: cluster-logging namespace: openshift-logging spec: - channel: stable-6.1 + channel: ${CLO_CHANNEL} name: cluster-logging source: redhat-operators sourceNamespace: openshift-marketplace diff --git a/ocp-resources/e2e/cluster-logging-install.yaml b/ocp-resources/e2e/cluster-logging-install.yaml index e39ae88b7eb..ca47fd0e8ea 100644 --- a/ocp-resources/e2e/cluster-logging-install.yaml +++ b/ocp-resources/e2e/cluster-logging-install.yaml @@ -50,7 +50,7 @@ metadata: name: cluster-logging namespace: openshift-logging spec: - channel: stable + channel: ${CLO_CHANNEL} name: cluster-logging source: redhat-operators sourceNamespace: openshift-marketplace