Skip to content

Commit b1147e8

Browse files
authored
test: improve how we set PUBLISH_UI (codeready-toolchain#1233)
* improve * requested changes
1 parent f9b2d6d commit b1147e8

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

make/devsandbox-dashboard.mk

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@ UI_ENVIRONMENT := ui-e2e-tests
66
SSO_USERNAME_READ := $(shell if [ -n "$(CI)" ]; then cat /usr/local/sandbox-secrets/SSO_USERNAME 2>/dev/null || echo ""; else echo "${SSO_USERNAME}"; fi)
77
SSO_PASSWORD_READ := $(shell if [ -n "$(CI)" ]; then cat /usr/local/sandbox-secrets/SSO_PASSWORD 2>/dev/null || echo ""; else echo "${SSO_PASSWORD}"; fi)
88

9-
10-
PUBLISH_UI ?= false
9+
PUBLISH_UI ?= true
1110
DEPLOY_UI ?= true
1211

12+
ifneq ($(CLONEREFS_OPTIONS),)
13+
PUBLISH_UI = false
14+
endif
15+
16+
1317
.PHONY: get-and-publish-devsandbox-dashboard
1418
get-and-publish-devsandbox-dashboard:
1519
ifneq (${UI_REPO_PATH},)
@@ -49,7 +53,7 @@ test-devsandbox-dashboard-e2e: get-and-publish-devsandbox-dashboard e2e-run-devs
4953

5054
.PHONY: test-devsandbox-dashboard-e2e-local
5155
test-devsandbox-dashboard-e2e-local:
52-
$(MAKE) get-and-publish-devsandbox-dashboard e2e-run-devsandbox-dashboard UI_REPO_PATH=${PWD}/../devsandbox-dashboard PUBLISH_UI=true DEPLOY_UI=true
56+
$(MAKE) get-and-publish-devsandbox-dashboard e2e-run-devsandbox-dashboard UI_REPO_PATH=${PWD}/../devsandbox-dashboard
5357

5458
.PHONY: clean-devsandbox-dashboard
5559
clean-devsandbox-dashboard: HOST_NS=$(shell oc get projects -l app=host-operator --output=name -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}' | sort | tail -n 1)

0 commit comments

Comments
 (0)