test: refactor pairing with UI code #1227
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,4 +2,4 @@ apiVersion: v1 | |
| kind: ServiceAccount | ||
| metadata: | ||
| name: rhdh | ||
| namespace: ${DEVSANDBOX_DASHBOARD_NS} | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,235 +1,95 @@ | ||
| DEVSANDBOX_DASHBOARD_NS := devsandbox-dashboard | ||
| IMAGE_PLATFORM ?= linux/amd64 | ||
| KUBECONFIG ?= $(HOME)/.kube/config | ||
|
Contributor
There was a problem hiding this comment. just curious - why do we need to set the
Contributor
There was a problem hiding this comment. Oh nvm, now I saw it's because you were using it here and about to remove it I guess ..
Contributor
Author
There was a problem hiding this comment. To be used on |
||
| OPENID_SECRET_NAME := openid-sandbox-public-client-secret | ||
| 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) | ||
|
|
||
| QUAY_NAMESPACE ?= codeready-toolchain-test | ||
|
rsoaresd marked this conversation as resolved.
Outdated
|
||
|
|
||
| PUBLISH_UI ?= false | ||
| DEPLOY_UI ?= true | ||
|
|
||
| .PHONY: get-and-publish-devsandbox-dashboard | ||
| get-and-publish-devsandbox-dashboard: | ||
| ifneq (${UI_REPO_PATH},) | ||
| $(eval UI_REPO_PATH_PARAM = -ur ${UI_REPO_PATH}) | ||
| endif | ||
| ifneq (${FORCED_TAG},) | ||
| $(eval FORCED_TAG_PARAM = -ft ${FORCED_TAG}) | ||
| endif | ||
| @echo "Publishing and installing the Developer Sandbox Dashboard" | ||
| scripts/ci/manage-devsandbox-dashboard.sh -pp ${PUBLISH_UI} ${UI_REPO_PATH_PARAM} -ds ${DATE_SUFFIX} -qn ${QUAY_NAMESPACE} ${FORCED_TAG_PARAM} -du ${DEPLOY_UI} -ns ${DEVSANDBOX_DASHBOARD_NS} -os ${OPENID_SECRET_NAME} -en ${UI_ENVIRONMENT} | ||
|
|
||
| .PHONY: e2e-run-devsandbox-dashboard | ||
| e2e-run-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) | ||
| e2e-run-devsandbox-dashboard: RHDH=https://rhdh-${DEVSANDBOX_DASHBOARD_NS}.$(shell oc get ingress.config.openshift.io/cluster -o jsonpath='{.spec.domain}') | ||
| e2e-run-devsandbox-dashboard: | ||
| $(eval PWGO_VER := $(shell grep -oE "playwright-go v\S+" go.mod | sed 's/playwright-go //g')) | ||
| @echo "Installing Playwright CLI version: $(PWGO_VER)" | ||
| go install github.com/playwright-community/playwright-go/cmd/playwright@$(PWGO_VER) | ||
| @echo "Installing Firefox browser for Playwright..." | ||
| $(GOPATH)/bin/playwright install firefox | ||
|
Comment on lines
33
to
35
Collaborator
There was a problem hiding this comment. I know that it wasn't changed in this PR so take it as an suggestion for later improvement.
Contributor
There was a problem hiding this comment. Once we upgrade to Go 1.24 I think we will be able to use go tool and run it with: |
||
|
|
||
| @echo "Running Developer Sandbox Dashboard setup e2e tests..." | ||
| DEVSANDBOX_DASHBOARD_NS=${DEVSANDBOX_DASHBOARD_NS} go test "./test/e2e/sandbox-ui/setup" -v -timeout=10m -failfast | ||
|
|
||
| @echo "Running Developer Sandbox Dashboard e2e tests in firefox..." | ||
| @SSO_USERNAME=$(SSO_USERNAME_READ) SSO_PASSWORD=$(SSO_PASSWORD_READ) BASE_URL=${RHDH} BROWSER=firefox envsubst < deploy/sandbox-ui/ui-e2e-tests/.env > testsupport/sandbox-ui/.env | ||
| go test "./test/e2e/sandbox-ui" -v -timeout=10m -failfast | ||
| @oc delete usersignup $(SSO_USERNAME_READ) -n $(HOST_NS) | ||
|
|
||
| @echo "The Developer Sandbox Dashboard e2e tests successfully finished" | ||
|
|
||
| .PHONY: test-devsandbox-dashboard-e2e | ||
| test-devsandbox-dashboard-e2e: get-and-publish-devsandbox-dashboard e2e-run-devsandbox-dashboard | ||
|
|
||
| .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 | ||
|
|
||
| .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) | ||
| clean-devsandbox-dashboard: | ||
| @oc delete ns ${DEVSANDBOX_DASHBOARD_NS} | ||
| @oc delete secret ${OPENID_SECRET_NAME} -n openshift-config | ||
| @oc delete usersignup ${SSO_USERNAME} -n ${HOST_NS} | ||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
|
|
||
|
|
||
| E2E_TEST_IMAGE_NAME=devsandbox-dashboard-e2e-tests | ||
| E2E_TEST_DOCKERFILE=build/sandbox-ui/Dockerfile | ||
|
|
||
| # Build Developer Sandbox Dashboard e2e tests image using podman | ||
| .PHONY: build-devsandbox-dashboard-e2e-tests | ||
| build-devsandbox-dashboard-e2e-tests: | ||
| @echo "building the $(E2E_TEST_IMAGE_NAME) image with podman..." | ||
| podman build --platform $(IMAGE_PLATFORM) -t $(E2E_TEST_IMAGE_NAME) -f $(E2E_TEST_DOCKERFILE) . | ||
|
|
||
| # Run Developer Sandbox Dashboard e2e tests image using podman | ||
| .PHONY: test-devsandbox-dashboard-in-container | ||
| test-devsandbox-dashboard-in-container: build-devsandbox-dashboard-e2e-tests | ||
| ifneq ($(UI_REPO_PATH),) | ||
| $(eval FORCED_TAG := $(DATE_SUFFIX)) | ||
| $(eval ABS_UI_REPO_PATH := $(abspath $(UI_REPO_PATH))) | ||
| @echo "Generated FORCED_TAG: $(FORCED_TAG)" | ||
| @echo "Using UI_REPO_PATH: $(ABS_UI_REPO_PATH)" | ||
| @echo "pushing Developer Dashboard image..." | ||
| $(MAKE) get-and-publish-devsandbox-dashboard PUBLISH_UI=true DEPLOY_UI=false FORCED_TAG=$(FORCED_TAG) UI_REPO_PATH=$(UI_REPO_PATH) | ||
| else | ||
| @echo "Skipping Developer Sandbox Dashboard publish - UI_REPO_PATH not set" | ||
| endif | ||
| @echo "running the e2e tests in podman container..." | ||
| podman run --platform $(IMAGE_PLATFORM) --rm \ | ||
| -v $(KUBECONFIG):/root/.kube/config \ | ||
|
rsoaresd marked this conversation as resolved.
|
||
| -e KUBECONFIG=/root/.kube/config \ | ||
| -v ${PWD}:/root/toolchain-e2e \ | ||
| -e E2E_REPO_PATH=/root/toolchain-e2e \ | ||
| $(if $(ABS_UI_REPO_PATH),-v $(ABS_UI_REPO_PATH):/root/devsandbox-dashboard -e UI_REPO_PATH=/root/devsandbox-dashboard) \ | ||
| $(if $(ABS_UI_REPO_PATH),-e FORCED_TAG=$(FORCED_TAG)) \ | ||
| -e SSO_USERNAME=$(SSO_USERNAME) \ | ||
| -e SSO_PASSWORD=$(SSO_PASSWORD) \ | ||
| -e QUAY_NAMESPACE=$(QUAY_NAMESPACE) \ | ||
| -e DEPLOY_UI=true \ | ||
| -e PUBLISH_UI=false \ | ||
| $(E2E_TEST_IMAGE_NAME) make test-devsandbox-dashboard-e2e | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -49,9 +49,9 @@ ifeq ($(CI),true) | |
| # if we are running on CI, we want to run the ui e2e tests in the toolchain-e2e presubmit and periodic CI jobs | ||
| # if REPO_NAME is not set, it means that the e2e tests were triggered by the periodic CI job | ||
| ifeq ($(filter-out toolchain-e2e,$(REPO_NAME)),) | ||
| $(MAKE) test-devsandbox-dashboard-e2e | ||
| @echo "UI E2E tests successfully finished" | ||
| @echo "To clean the Developer Sandbox Dashboard run 'make clean-devsandbox-dashboard'" | ||
| endif | ||
| endif | ||
|
|
||
|
|
@@ -294,7 +294,9 @@ deploy-single-member-e2e-latest: | |
|
|
||
| .PHONY: publish-current-bundles-for-e2e | ||
| ## Target that is supposed to be called from CI - it builds & publishes the current operator bundles | ||
| publish-current-bundles-for-e2e: PUBLISH_UI=true | ||
| publish-current-bundles-for-e2e: DEPLOY_UI=false | ||
|
Comment on lines
+297
to
+298
Collaborator
There was a problem hiding this comment. I'm wondering, couldn't we use the same default values as we use for operators? - to keep it consistent
Contributor
Author
There was a problem hiding this comment. I set them in |
||
| publish-current-bundles-for-e2e: get-and-publish-operators get-and-publish-devsandbox-dashboard | ||
|
|
||
| .PHONY: get-and-publish-operators | ||
| get-and-publish-operators: PUBLISH_OPERATOR=true | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
also suggestion for later - can you move this
yum installsection more up before copying the folder so it uses the cached snapshots? With the current order it always installs the dependency for every run