Skip to content

Commit 7813e3a

Browse files
committed
Export tag on release branch only
1 parent 7bac06c commit 7813e3a

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

openshift/e2e-common.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,9 @@ install_serverless_operator() {
112112
if ! git ls-remote --heads --exit-code "$repository" "$so_branch" &>/dev/null; then
113113
echo "Release branch doesn't exist yet, using main"
114114
so_branch="main"
115+
else
116+
USE_IMAGE_RELEASE_TAG="${project_tag}"
117+
export USE_IMAGE_RELEASE_TAG
115118
fi
116119

117120
local operator_dir=/tmp/serverless-operator
@@ -122,12 +125,10 @@ install_serverless_operator() {
122125
pushd $operator_dir
123126

124127
export SKIP_MESH_AUTH_POLICY_GENERATION=true
125-
USE_IMAGE_RELEASE_TAG="${project_tag}"
126-
export USE_IMAGE_RELEASE_TAG
127128
export ON_CLUSTER_BUILDS=true
128129
export DOCKER_REPO_OVERRIDE=image-registry.openshift-image-registry.svc:5000/openshift-marketplace
129130

130-
make generated-files images install-serving install-eventing || failed=1
131+
make images install-serving install-eventing || failed=1
131132
subheader "Successfully installed serverless operator."
132133

133134
# Workaround default 'https' scheme

0 commit comments

Comments
 (0)