Add remote-test option for E2E #876
Conversation
ArangoGutierrez
added
the
testing
|
Next step is to have this to run during PR's, merge events and Tag cuts |
test/e2e/e2e_test.go
Outdated
| return localRunScript(script) | ||
| } | ||
|
|
||
| func localRunScript(script string) (string, error) { |
There was a problem hiding this comment.
I wonder if I should move everything from this line forward to the utils.go file
There was a problem hiding this comment.
I think we could move all the script specifics to a separate file, but not utils.go.
There was a problem hiding this comment.
Sorry, I should have been more clear. I think we should separate logic according to functionality / domain and name the files accordingly. Using tools.go as a catch-all does not achieve this.
test/e2e/utils.go
Outdated
| set -xe | ||
| ` | ||
|
|
||
| var dockerInstallTemplate = ` |
There was a problem hiding this comment.
The idea here is that in the future, we will have different methods of installation to test, for example, CDI vs non-CDI.
test/e2e/utils.go
Outdated
|
|
||
| : ${IMAGE:={{.Image}}} | ||
|
|
||
| sudo ln -s /var/run/nvidia-container-toolkit/toolkit/nvidia-container-runtime-hook /usr/bin/nvidia-container-runtime-hook |
There was a problem hiding this comment.
Do we want to add a comment as to why this is required?
There was a problem hiding this comment.
sure, more documentation never hurts
test/e2e/Makefile
Outdated
| .PHONY: test | ||
| test: | ||
| E2E_IMAGE_NAME ?= ghcr.io/nvidia/container-toolkit | ||
| E2E_IMAGE_TAG ?= latest |
There was a problem hiding this comment.
latest is never a valid tag in this repo. Can we rather error out if this isn't set for the remote case.
test/e2e/Makefile
Outdated
| E2E_SSH_HOST ?= | ||
|
|
||
| .PHONY: local-test remote-test | ||
| # Local test assumes that the container-toolkit is already installed on the host |
There was a problem hiding this comment.
Do we need the distinction? Even when running locally, I may want to install the toolkit from an image that I've just built.
test/e2e/e2e_test.go
Outdated
| imageRepo string | ||
| imageTag string |
There was a problem hiding this comment.
Does this warrant a type? (same for the ssh info below)?
| var _ = Describe("docker", Ordered, func() { | ||
| // Install the NVIDIA Container Toolkit | ||
| BeforeAll(func(ctx context.Context) { | ||
| if sshKey != "" { |
There was a problem hiding this comment.
As I mentioned, we should probably allow the isntallation logic to be run locally too.
| // Install the NVIDIA Container Toolkit | ||
| BeforeAll(func(ctx context.Context) { | ||
| if sshKey != "" { | ||
| installScript, err := getInstallScript(dockerInstallTemplate, fmt.Sprintf("%s:%s", imageRepo, imageTag)) |
There was a problem hiding this comment.
does it make sense to return an Installer instead which implements Install() error?
test/e2e/utils.go
Outdated
| --restart-mode=systemd | ||
| ` | ||
|
|
||
| type DockerInstall struct { |
test/e2e/utils.go
Outdated
| "text/template" | ||
| ) | ||
|
|
||
| const Shebang = `#! /usr/bin/env bash |
There was a problem hiding this comment.
Is it not more confusing to have to remember to add the Shebang each time? Should we not use include this in the template / script.
test/e2e/utils.go
Outdated
| docker run --pid=host --rm -i --privileged \ | ||
| -v /:/host \ | ||
| -v /var/run/docker.sock:/var/run/docker.sock \ | ||
| -v /var/run/nvidia-container-toolkit:/var/run/nvidia-container-toolkit \ |
There was a problem hiding this comment.
I think we should use a temporary path here since we ideally want to remove the config again after the tests.
Signed-off-by: Carlos Eduardo Arango Gutierrez <eduardoa@nvidia.com>
ArangoGutierrez
force-pushed
the
reg_test02
branch
from
58379b2 to
f2a0b50
Compare
No description provided.