From b3728406e00a3c524bc7a87faa93e40d9432f7a8 Mon Sep 17 00:00:00 2001 From: Carlos Eduardo Arango Gutierrez Date: Thu, 24 Apr 2025 20:50:18 +0200 Subject: [PATCH] [no-relnote] Update Github Actions E2E Signed-off-by: Carlos Eduardo Arango Gutierrez --- .github/workflows/e2e.yaml | 13 ++++++++++--- tests/e2e/README.md | 7 ++++--- tests/e2e/e2e_test.go | 26 +++++++++++++++++++------- 3 files changed, 33 insertions(+), 13 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 3a3275de..e1937aaa 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -70,8 +70,8 @@ jobs: - name: Run e2e tests env: - IMAGE_NAME: ghcr.io/nvidia/container-toolkit - VERSION: ${{ inputs.version }} + E2E_IMAGE_REPO: ghcr.io/nvidia/container-toolkit + E2E_IMAGE_TAG: ${{ inputs.version }}-ubuntu20.04 SSH_KEY: ${{ secrets.AWS_SSH_KEY }} E2E_SSH_USER: ${{ secrets.E2E_SSH_USER }} E2E_SSH_HOST: ${{ steps.holodeck_public_dns_name.outputs.result }} @@ -82,8 +82,15 @@ jobs: chmod 600 "$e2e_ssh_key" export E2E_SSH_KEY="$e2e_ssh_key" - make -f tests/e2e/Makefile test + make -f tests/e2e/Makefile test-e2e + - name: Archive Ginkgo logs + uses: actions/upload-artifact@v4 + with: + name: ginkgo-logs + path: ginkgo.json + retention-days: 15 + - name: Send Slack alert notification if: ${{ failure() }} uses: slackapi/slack-github-action@v2.0.0 diff --git a/tests/e2e/README.md b/tests/e2e/README.md index 43d840c3..06f2b0b2 100644 --- a/tests/e2e/README.md +++ b/tests/e2e/README.md @@ -59,9 +59,10 @@ compatibility runs, and pre‑release validation of new CTK builds. | Variable | Required | Example | Description | |----------|----------|---------|-------------| | `INSTALL_CTK` | ✖ | `true` | When `true` the test installs CTK on the remote host before running the image. When `false` it assumes CTK is already present. | -| `TOOLKIT_IMAGE` | ✔ | `nvcr.io/nvidia/cuda:12.4.0-runtime-ubi9` | Image that will be pulled & executed. | -| `SSH_KEY` | ✔ | `/home/ci/.ssh/id_rsa` | Private key used for authentication. | -| `SSH_USER` | ✔ | `ubuntu` | Username on the remote host. | +| `E2E_IMAGE_REPO` | ✔ | `ghcr.io/nvidia/container-toolkit` | Container Toolkit Image | +| `E2E_IMAGE_TAG` | ✔ | `latest` | Image tag | +| `E2E_SSH_KEY` | ✔ | `/home/ci/.ssh/id_rsa` | Private key used for authentication. | +| `E2E_SSH_USER` | ✔ | `ubuntu` | Username on the remote host. | | `REMOTE_HOST` | ✔ | `gpurunner01.corp.local` | Hostname or IP address of the target node. | | `REMOTE_PORT` | ✔ | `22` | SSH port of the target node. | diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go index 3d16bf26..885aa1ca 100644 --- a/tests/e2e/e2e_test.go +++ b/tests/e2e/e2e_test.go @@ -100,7 +100,7 @@ func getTestEnv() { _, thisFile, _, _ := runtime.Caller(0) packagePath = filepath.Dir(thisFile) - installCTK = getBoolEnvVar("INSTALL_CTK", false) + installCTK = getBoolEnvVar("E2E_INSTALL_CTK", false) ImageRepo = os.Getenv("E2E_IMAGE_REPO") Expect(ImageRepo).NotTo(BeEmpty(), "E2E_IMAGE_REPO environment variable must be set") @@ -108,17 +108,16 @@ func getTestEnv() { ImageTag = os.Getenv("E2E_IMAGE_TAG") Expect(ImageTag).NotTo(BeEmpty(), "E2E_IMAGE_TAG environment variable must be set") - sshKey = os.Getenv("SSH_KEY") - Expect(sshKey).NotTo(BeEmpty(), "SSH_KEY environment variable must be set") + sshKey = os.Getenv("E2E_SSH_KEY") + Expect(sshKey).NotTo(BeEmpty(), "E2E_SSH_KEY environment variable must be set") - sshUser = os.Getenv("SSH_USER") + sshUser = os.Getenv("E2E_SSH_USER") Expect(sshUser).NotTo(BeEmpty(), "SSH_USER environment variable must be set") - host = os.Getenv("REMOTE_HOST") + host = os.Getenv("E2E_SSH_HOST") Expect(host).NotTo(BeEmpty(), "REMOTE_HOST environment variable must be set") - sshPort = os.Getenv("REMOTE_PORT") - Expect(sshPort).NotTo(BeEmpty(), "REMOTE_PORT environment variable must be set") + sshPort = getIntEnvVar("E2E_SSH_PORT", 22) // Get current working directory cwd, err = os.Getwd() @@ -137,3 +136,16 @@ func getBoolEnvVar(key string, defaultValue bool) bool { } return boolValue } + +// getIntEnvVar returns the integer value of the environment variable or the default value if not set. +func getIntEnvVar(key string, defaultValue int) string { + value := os.Getenv(key) + if value == "" { + return strconv.Itoa(defaultValue) + } + intValue, err := strconv.Atoi(value) + if err != nil { + return strconv.Itoa(defaultValue) + } + return strconv.Itoa(intValue) +}