Skip to content
Merged
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions make/devsandbox-dashboard.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@ UI_ENVIRONMENT := ui-e2e-tests
SSO_USERNAME_READ := $(shell if [ -n "$(CI)" ]; then cat /usr/local/sandbox-secrets/SSO_USERNAME 2>/dev/null || echo ""; else echo "${SSO_USERNAME}"; fi)
SSO_PASSWORD_READ := $(shell if [ -n "$(CI)" ]; then cat /usr/local/sandbox-secrets/SSO_PASSWORD 2>/dev/null || echo ""; else echo "${SSO_PASSWORD}"; fi)


PUBLISH_UI ?= false
PUBLISH_UI ?= true
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't it be the other way around? false by default but if CLONEREFS_OPTIONS then set it to true?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When running in CI (CLONEREFS_OPTIONS set), we want PUBLISH_UI to false. Because we will push it in a GH action through this make target: https://github.com/codeready-toolchain/toolchain-e2e/blob/master/make/test.mk#L295-L304

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah ok, thanks for the explanation

DEPLOY_UI ?= true

ifneq ($(CLONEREFS_OPTIONS),)
PUBLISH_UI = false
endif


.PHONY: get-and-publish-devsandbox-dashboard
get-and-publish-devsandbox-dashboard:
ifneq (${UI_REPO_PATH},)
Expand Down Expand Up @@ -49,7 +53,7 @@ test-devsandbox-dashboard-e2e: get-and-publish-devsandbox-dashboard e2e-run-devs

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

.PHONY: clean-devsandbox-dashboard
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)
Expand Down
Loading