[no-relnote] Allow local tests

Signed-off-by: Evan Lezar <[email protected]>

Author: elezar

tests/e2e/Makefile

@@ -23,6 +23,14 @@ GINKGO_BIN := $(CURDIR)/bin/ginkgo
 test: $(GINKGO_BIN)
 	$(GINKGO_BIN) $(GINKGO_ARGS) -v --json-report ginkgo.json ./tests/e2e/...
 
+# test-reinstalled runs the test cases against the version of the toolkit that
+# is already installed (and configured for docker) on the host.
+.PHONY: test-preinstalled
+test-preinstalled: test
+test-preinstalled: E2E_INSTALL_CTK = false
+test-preinstalled: E2E_SSH_HOST =
+
+
 $(GINKGO_BIN):
 	mkdir -p $(CURDIR)/bin
 	GOBIN=$(CURDIR)/bin go install github.com/onsi/ginkgo/v2/ginkgo@latest

tests/e2e/e2e_test.go

@@ -69,11 +69,13 @@ func getTestEnv() {
 
 	}
 
-	sshKey = getRequiredEnvvar[string]("E2E_SSH_KEY")
-	sshUser = getRequiredEnvvar[string]("E2E_SSH_USER")
-	sshHost = getRequiredEnvvar[string]("E2E_SSH_HOST")
+	sshHost = getEnvVarOrDefault("E2E_SSH_HOST", "")
+	if sshHost != "" {
+		sshKey = getRequiredEnvvar[string]("E2E_SSH_KEY")
+		sshUser = getRequiredEnvvar[string]("E2E_SSH_USER")
+		sshPort = getEnvVarOrDefault("E2E_SSH_PORT", "22")
+	}
 
-	sshPort = getEnvVarOrDefault("E2E_SSH_PORT", "22")
 }
 
 // getRequiredEnvvar returns the specified envvar if set or raises an error.

tests/e2e/nvidia-container-toolkit_test.go

@@ -399,7 +399,7 @@ var _ = Describe("docker", Ordered, ContinueOnFailure, func() {
 			Expect(err).ToNot(HaveOccurred())
 
 			_, _, err = runner.Run(`docker build -t firmware-test \
-            --build-arg RM_VERSION="$(basename $(ls -d /lib/firmware/nvidia/*.*))" \
+            --build-arg RM_VERSION="` + hostDriverVersion + `" \
             --build-arg CURRENT_DIR="` + outputDir + `" \
             - <<EOF
 FROM ubuntu