File tree Expand file tree Collapse file tree 4 files changed +11
-11
lines changed
applications/openshift/api-server
audit_log_forwarding_enabled_logging_api/tests/ocp4
audit_log_forwarding_enabled/tests/ocp4 Expand file tree Collapse file tree 4 files changed +11
-11
lines changed Original file line number Diff line number Diff line change 11#! /bin/bash
22set -xe
33
4- ocp_version=$( oc version -ojson | jq -r ' .openshiftVersion' )
5- clo_v6_available_from=" 4.14.0"
4+ export CLO_CHANNEL=$( oc get packagemanifest -o jsonpath=' {range .status.channels[*]}{.name}{"\n"}{end}' -n openshift-marketplace cluster-logging | sort | tail -1)
65
7- if [ " $( printf ' %s\n ' " $ocp_version " " $clo_v6_available_from " | sort -V | head -n1 ) " = " $clo_v6_available_from " ]; then
6+ if [ " ${CLO_CHANNEL} " =~ stable-6 \. * ]; then
87 echo " OCP ${ocp_version} has CLO 6.0 is available for install" ;
98 install_v6=true
109fi
1110
11+ echo " installing cluster-logging-operator from channel ${CLO_CHANNEL} "
1212if [ " $install_v6 " = true ] ; then
13- echo " installing cluster-logging-operator V6.0"
14- oc apply -f ${ROOT_DIR} /ocp-resources/e2e/cluster-logging-install-observability.yaml
13+ envsubst < <( cat ${ROOT_DIR} /ocp-resources/e2e/cluster-logging-install-observability.yaml) | oc apply -f
1514else
16- echo " installing cluster-logging-operator"
17- oc apply -f ${ROOT_DIR} /ocp-resources/e2e/cluster-logging-install.yaml
15+ envsusbst < <( cat ${ROOT_DIR} /ocp-resources/e2e/cluster-logging-install.yaml) | oc apply -f
1816fi
1917
2018sleep 30
Original file line number Diff line number Diff line change 11#! /bin/bash
22set -xe
33
4- echo " installing cluster-logging-operator"
5- oc apply -f ${ROOT_DIR} /ocp-resources/e2e/cluster-logging-install.yaml
4+ export CLO_CHANNEL=$( oc get packagemanifest -o jsonpath=' {range .status.channels[*]}{.name}{"\n"}{end}' -n openshift-marketplace cluster-logging | sort | tail -1)
5+
6+ echo " installing cluster-logging-operator from channel ${CLO_CHANNEL} "
7+ envsusbst < <( cat ${ROOT_DIR} /ocp-resources/e2e/cluster-logging-install.yaml) | oc apply -f
68
79sleep 30
810
Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ metadata:
5050 name : cluster-logging
5151 namespace : openshift-logging
5252spec :
53- channel : stable-6.1
53+ channel : ${CLO_CHANNEL}
5454 name : cluster-logging
5555 source : redhat-operators
5656 sourceNamespace : openshift-marketplace
Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ metadata:
5050 name : cluster-logging
5151 namespace : openshift-logging
5252spec :
53- channel : stable
53+ channel : ${CLO_CHANNEL}
5454 name : cluster-logging
5555 source : redhat-operators
5656 sourceNamespace : openshift-marketplace
You can’t perform that action at this time.
0 commit comments