diff --git a/openshift/e2e-common.sh b/openshift/e2e-common.sh index 55ff6556d398..ce357e1b6b72 100644 --- a/openshift/e2e-common.sh +++ b/openshift/e2e-common.sh @@ -109,14 +109,10 @@ function update_csv(){ local KOURIER_VERSION=$(metadata.get dependencies.kourier) local KOURIER_MINOR_VERSION=${KOURIER_VERSION%.*} # e.g. "0.21.0" => "0.21" - local KOURIER_CONTROL="registry.ci.openshift.org/openshift/knative-v${KOURIER_VERSION}:kourier" - local KOURIER_GATEWAY=$(grep -w "docker.io/maistra/proxyv2-ubi8" $SERVING_DIR/third_party/kourier-latest/kourier.yaml | awk '{print $NF}') + export KNATIVE_KOURIER_CONTROL="registry.ci.openshift.org/openshift/knative-v${KOURIER_VERSION}:kourier" + export KNATIVE_KOURIER_GATEWAY=$(grep -w "docker.io/maistra/proxyv2-ubi8" $SERVING_DIR/third_party/kourier-latest/kourier.yaml | awk '{print $NF}') local CSV="olm-catalog/serverless-operator/manifests/serverless-operator.clusterserviceversion.yaml" - # Replace kourier's image with the latest ones from third_party/kourier-latest - sed -i -e "s|\"docker.io/maistra/proxyv2-ubi8:.*\"|\"${KOURIER_GATEWAY}\"|g" ${CSV} - sed -i -e "s|\"registry.ci.openshift.org/openshift/knative-.*:kourier\"|\"${KOURIER_CONTROL}\"|g" ${CSV} - # release-next branch keeps updating the latest manifest in knative-serving-ci.yaml for serving resources. # see: https://github.com/openshift/knative-serving/blob/release-next/openshift/release/knative-serving-ci.yaml # So mount the manifest and use it by KO_DATA_PATH env value. @@ -183,7 +179,8 @@ function install_catalogsource(){ # And checkout the setup script based on that commit. local SERVERLESS_DIR=$(mktemp -d) local CURRENT_DIR=$(pwd) - git clone --depth 1 https://github.com/openshift-knative/serverless-operator.git ${SERVERLESS_DIR} + git clone --branch override_env_via_injection_net --depth 1 https://github.com/skonto/serverless-operator.git ${SERVERLESS_DIR} + pushd ${SERVERLESS_DIR} source ./test/lib.bash