Skip to content

Commit

Permalink
Do not use IMAGE_FORMAT env variable from CI (knative#797)
Browse files Browse the repository at this point in the history
* this variable is deprecated and is not available for pooled clusters
* it is replaced by concrete env variables for individual images which
are passed by CI operator (these dependencies need to be defined in CI
operator config as well)
  • Loading branch information
mgencur authored Aug 31, 2021
1 parent 60ab374 commit 8ced29e
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions openshift/e2e-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,13 @@ readonly SERVERLESS_BRANCH="main"

# Determine if we're running locally or in CI.
if [ -n "$OPENSHIFT_BUILD_NAMESPACE" ]; then
readonly TEST_IMAGE_TEMPLATE="${IMAGE_FORMAT//\$\{component\}/knative-client-test-{{.Name}}}"
readonly TEST_IMAGE_TEMPLATE=$(cat <<-END
{{- with .Name }}
{{- if eq . "helloworld"}}$KNATIVE_CLIENT_TEST_HELLOWORLD{{end -}}
{{- if eq . "grpc-ping"}}$KNATIVE_CLIENT_TEST_GRPC_PING{{end -}}
{{end -}}
END
)
elif [ -n "$DOCKER_REPO_OVERRIDE" ]; then
readonly TEST_IMAGE_TEMPLATE="${DOCKER_REPO_OVERRIDE}/{{.Name}}"
elif [ -n "$BRANCH" ]; then
Expand Down Expand Up @@ -106,7 +112,7 @@ run_client_e2e_tests(){
go test \
./test/e2e \
-v -timeout=$E2E_TIMEOUT -mod=vendor \
--imagetemplate $TEST_IMAGE_TEMPLATE \
--imagetemplate "$TEST_IMAGE_TEMPLATE" \
${run_append} || failed=$?

return $failed
Expand Down

0 comments on commit 8ced29e

Please sign in to comment.