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
23
23
test : $(GINKGO_BIN )
24
24
$(GINKGO_BIN ) $(GINKGO_ARGS ) -v --json-report ginkgo.json ./tests/e2e/...
25
25
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
+
26
34
$(GINKGO_BIN ) :
27
35
mkdir -p $(CURDIR ) /bin
28
36
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() {
69
69
70
70
}
71
71
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
+ }
75
78
76
- sshPort = getEnvVarOrDefault ("E2E_SSH_PORT" , "22" )
77
79
}
78
80
79
81
// getRequiredEnvvar returns the specified envvar if set or raises an error.
You can’t perform that action at this time.
0 commit comments