File tree Expand file tree Collapse file tree 2 files changed +14
-4
lines changed Expand file tree Collapse file tree 2 files changed +14
-4
lines changed Original file line number Diff line number Diff line change @@ -23,6 +23,14 @@ GINKGO_BIN := $(CURDIR)/bin/ginkgo
2323test : $(GINKGO_BIN )
2424 $(GINKGO_BIN ) $(GINKGO_ARGS ) -v --json-report ginkgo.json ./tests/e2e/...
2525
26+ # test-reinstalled runs the test cases against the version of the toolkit that
27+ # is already installed (and configured for docker) on the host.
28+ .PHONY : test-preinstalled
29+ test-preinstalled : test
30+ test-preinstalled : E2E_INSTALL_CTK = false
31+ test-preinstalled : E2E_SSH_HOST =
32+
33+
2634$(GINKGO_BIN ) :
2735 mkdir -p $(CURDIR ) /bin
2836 GOBIN=$(CURDIR ) /bin go install github.com/onsi/ginkgo/v2/ginkgo@latest
Original file line number Diff line number Diff line change @@ -69,11 +69,13 @@ func getTestEnv() {
6969
7070 }
7171
72- sshKey = getRequiredEnvvar [string ]("E2E_SSH_KEY" )
73- sshUser = getRequiredEnvvar [string ]("E2E_SSH_USER" )
74- sshHost = getRequiredEnvvar [string ]("E2E_SSH_HOST" )
72+ sshHost = getEnvVarOrDefault ("E2E_SSH_HOST" , "" )
73+ if sshHost != "" {
74+ sshKey = getRequiredEnvvar [string ]("E2E_SSH_KEY" )
75+ sshUser = getRequiredEnvvar [string ]("E2E_SSH_USER" )
76+ sshPort = getEnvVarOrDefault ("E2E_SSH_PORT" , "22" )
77+ }
7578
76- sshPort = getEnvVarOrDefault ("E2E_SSH_PORT" , "22" )
7779}
7880
7981// getRequiredEnvvar returns the specified envvar if set or raises an error.
You can’t perform that action at this time.
0 commit comments