Add GitHub action for E2E

Signed-off-by: Carlos Eduardo Arango Gutierrez <[email protected]>

mergable commit

Signed-off-by: Carlos Eduardo Arango Gutierrez <[email protected]>

Author: ArangoGutierrez

.github/workflows/ci.yaml

@@ -31,3 +31,13 @@ jobs:
     secrets: inherit
     with:
       version: ${{ needs.basic.outputs.version }}
+
+  e2e-test:
+    needs:
+    - image
+    - basic
+    secrets: inherit
+    uses: ./.github/workflows/e2e.yaml
+    with:
+      version: ${{ needs.basic.outputs.version }}
+      golang_version: ${{ needs.basic.outputs.golang_version }}

.github/workflows/e2e.yaml

@@ -0,0 +1,97 @@
+# Copyright 2025 NVIDIA CORPORATION
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: End-to-end Tests
+
+on:
+  workflow_call:
+    inputs:
+      version:
+        required: true
+        type: string
+      golang_version:
+        required: true
+        type: string
+    secrets:
+      AWS_ACCESS_KEY_ID:
+        required: true
+      AWS_SECRET_ACCESS_KEY:
+        required: true
+      AWS_SSH_KEY:
+        required: true
+      SLACK_BOT_TOKEN:
+        required: true
+      SLACK_CHANNEL_ID:
+        required: true
+
+jobs:
+  e2e-tests:
+    runs-on: linux-amd64-cpu4
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v4
+
+    - name: Install Go
+      uses: actions/setup-go@v5
+      with:
+        go-version: ${{ inputs.golang_version }}
+
+    - name: Set up Holodeck
+      uses: NVIDIA/[email protected]
+      with:
+        aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws_ssh_key: ${{ secrets.AWS_SSH_KEY }}
+        holodeck_config: "tests/e2e/infra/holodeck.yaml"
+
+    - name: Run e2e tests
+      env:
+        KUBECONFIG: ${{ github.workspace }}/kubeconfig
+        HELM_CHART: ${{ github.workspace }}/deployments/helm/nvidia-dra-driver-gpu
+        E2E_IMAGE_REPO: ghcr.io/nvidia/k8s-dra-driver-gpu
+        E2E_IMAGE_TAG: ${{ inputs.version }}-ubi9
+        E2E_IMAGE_PULL_POLICY: IfNotPresent
+        LOG_ARTIFACTS_DIR: ${{ github.workspace }}/e2e_logs
+      run: |
+        make -f tests/e2e/Makefile test-e2e
+
+    - name: Archive test logs
+      if: ${{ failure() }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: e2e-test-logs
+        path: ./e2e_logs/
+        retention-days: 15
+    
+    - name: Archive Ginkgo logs
+      uses: actions/upload-artifact@v4
+      with:
+        name: ginkgo-logs
+        path: ginkgo.json
+        retention-days: 15
+
+    - name: Post text to a Slack channel
+      if: ${{ failure() }}
+      uses: slackapi/[email protected]
+      env:
+        SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
+        SUMMARY_URL: https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
+      with:
+        method: chat.postMessage
+        token: ${{ secrets.SLACK_BOT_TOKEN }}
+        payload: |
+          channel: ${{ secrets.SLACK_CHANNEL_ID }}
+          text: ":x: On repository ${{ github.repository }} the Workflow *${{ github.workflow }}* has failed.
+
+          Details: ${{ env.SUMMARY_URL }}"

.github/workflows/image.yaml

@@ -28,18 +28,22 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         name: Check out code
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
         with:
           image: tonistiigi/binfmt:qemu-v7.0.0-28
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
+          
       - name: Build image
         env:
           IMAGE_NAME: ghcr.io/nvidia/k8s-dra-driver-gpu

Makefile

@@ -31,7 +31,7 @@ CMDS := $(patsubst ./cmd/%/,%,$(sort $(dir $(wildcard ./cmd/*/))))
 CMD_TARGETS := $(patsubst %,cmd-%, $(CMDS))
 
 CHECK_TARGETS := golangci-lint check-generate
-MAKE_TARGETS := binaries build build-image check fmt lint-internal test examples cmds coverage generate vendor check-modules $(CHECK_TARGETS) ginkgo
+MAKE_TARGETS := binaries build build-image check fmt lint-internal test examples cmds coverage generate vendor check-modules $(CHECK_TARGETS)
 
 TARGETS := $(MAKE_TARGETS) $(CMD_TARGETS)
 
@@ -47,8 +47,6 @@ CLI_VERSION = $(VERSION)
 endif
 CLI_VERSION_PACKAGE = $(MODULE)/internal/info
 
-GINKGO_ARGS ?=
-
 binaries: cmds
 ifneq ($(PREFIX),)
 cmd-%: COMMAND_BUILD_OPTIONS = -o $(PREFIX)/$(*)
@@ -93,13 +91,6 @@ vendor:
 check-modules: vendor
 	git diff --quiet HEAD -- go.mod go.sum vendor
 
-ginkgo: $(CURDIR)/bin/ginkgo
-	mkdir -p $(CURDIR)/bin
-	GOBIN=$(CURDIR)/bin go install github.com/onsi/ginkgo/v2/ginkgo@latest
-
-e2e-test: ginkgo
-	./bin/ginkgo $(GINKGO_ARGS) -v --json-report ginkgo.json ./tests/e2e/...
-
 COVERAGE_FILE := coverage.out
 test: build cmds
 	go test -race -cover -v -coverprofile=$(COVERAGE_FILE) $(MODULE)/...

hack/e2e-test.sh

@@ -0,0 +1,24 @@
+# Copyright (c) 2025, NVIDIA CORPORATION.  All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+.PHONY: test-e2e ginkgo
+
+GINKGO_ARGS ?=
+LOG_ARTIFACTS_DIR ?= $(CURDIR)/e2e_logs
+
+ginkgo:
+	mkdir -p $(CURDIR)/bin
+	GOBIN=$(CURDIR)/bin go install github.com/onsi/ginkgo/v2/ginkgo@latest
+
+test-e2e: ginkgo
+	$(CURDIR)/bin/ginkgo $(GINKGO_ARGS) -v --json-report $(CURDIR)/ginkgo.json ./tests/e2e/...

tests/e2e/Makefile

@@ -54,9 +54,6 @@ func cleanupCRDs() {
 	crds := []string{
 		"computedomains.resource.nvidia.com",
 	}
-	if EnableGFD {
-		crds = append(crds, "nodefeatures.nfd.k8s-sigs.io", "nodefeaturerules.nfd.k8s-sigs.io")
-	}
 
 	for _, crd := range crds {
 		err := extClient.ApiextensionsV1().CustomResourceDefinitions().Delete(ctx, crd, metav1.DeleteOptions{})
@@ -252,13 +249,10 @@ func cleanupNodeLabels() error {
 			changed = true
 		}
 
-		// Conditionally remove additional labels if EnableGFD is true.
-		if EnableGFD {
-			for key := range node.Labels {
-				if strings.HasPrefix(key, "feature.node.kubernetes.io/") || strings.HasPrefix(key, "nvidia.com/") {
-					delete(node.Labels, key)
-					changed = true
-				}
+		for key := range node.Labels {
+			if strings.HasPrefix(key, "nvidia.com/") {
+				delete(node.Labels, key)
+				changed = true
 			}
 		}
 

tests/e2e/cleanup_test.go

@@ -19,6 +19,7 @@ package e2e
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"log"
 	"os"
@@ -30,7 +31,6 @@ import (
 
 	v1beta1 "github.com/NVIDIA/k8s-dra-driver-gpu/pkg/nvidia.com/clientset/versioned"
 	"github.com/NVIDIA/k8s-test-infra/pkg/diagnostics"
-	"helm.sh/helm/v3/pkg/repo"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -41,6 +41,7 @@ import (
 	extclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/rand"
 	"k8s.io/apimachinery/pkg/util/wait"
 	clientset "k8s.io/client-go/kubernetes"
@@ -76,7 +77,6 @@ var (
 	resourceClient *v1beta1.Clientset
 
 	testNamespace *corev1.Namespace // Every test has at least one namespace unless creation is skipped
-	EnableGFD     bool
 
 	// Helm
 	helmClient      helm.Client
@@ -134,8 +134,8 @@ var _ = BeforeSuite(func() {
 	helmReleaseName = "nvidia-dra-driver-gpu-e2e-test" + rand.String(5)
 	getHelmClient()
 
-	// Deploy GFD + NFD
-	deployDependencies(ctx)
+	// Label the nodes with nvidia.com/gpu.present=true
+	setNodeLabels(ctx)
 
 	// Set Helm values options
 	setHelmValuesOptions()
@@ -214,7 +214,7 @@ func getTestEnv() {
 	HelmChart = os.Getenv("HELM_CHART")
 	Expect(HelmChart).NotTo(BeEmpty(), "HELM_CHART must be set")
 
-	LogArtifactDir = os.Getenv("LOG_ARTIFACT_DIR")
+	LogArtifactDir = os.Getenv("LOG_ARTIFACTS_DIR")
 
 	ImageRepo = os.Getenv("E2E_IMAGE_REPO")
 	Expect(ImageRepo).NotTo(BeEmpty(), "IMAGE_REPO must be set")
@@ -223,13 +223,9 @@ func getTestEnv() {
 	Expect(ImageTag).NotTo(BeEmpty(), "IMAGE_TAG must be set")
 
 	ImagePullPolicy = os.Getenv("E2E_IMAGE_PULL_POLICY")
-	Expect(ImagePullPolicy).NotTo(BeEmpty(), "IMAGE_PULL_POLICY must be set")
-
-	EnableGFD = getBoolEnvVar("ENABLE_GFD", true)
-	Expect(EnableGFD).NotTo(BeNil(), "ENABLE_GFD must be set")
+	Expect(ImagePullPolicy).NotTo(BeEmpty(), "E2E_IMAGE_PULL_POLICY must be set")
 
 	HostManagedDrivers = getBoolEnvVar("E2E_HOST_MANAGED_DRIVERS", true)
-	Expect(HostManagedDrivers).NotTo(BeNil(), "E2E_HOST_MANAGED_DRIVERS must be set")
 
 	CollectLogsFrom = os.Getenv("COLLECT_LOGS_FROM")
 
@@ -306,42 +302,32 @@ func CreateTestingNS(baseName string, c clientset.Interface, labels map[string]s
 	return got, nil
 }
 
-// deployDependencies installs all the dependent helm charts
-func deployDependencies(ctx context.Context) {
-	// Install dependencies if not told to skip
-	if EnableGFD {
-		// Add or Update Helm repo
-		helmRepo := repo.Entry{
-			Name: "gfd",
-			URL:  "https://nvidia.github.io/k8s-device-plugin",
-		}
-		err := helmClient.AddOrUpdateChartRepo(helmRepo)
-		Expect(err).NotTo(HaveOccurred())
-
-		err = helmClient.UpdateChartRepos()
-		Expect(err).NotTo(HaveOccurred())
+// setNodeLabels sets the node labels for the test
+func setNodeLabels(ctx context.Context) error {
+	nodes, err := clientSet.CoreV1().Nodes().List(ctx, metav1.ListOptions{})
+	if err != nil {
+		log.Fatalf("list nodes: %v", err)
+	}
 
-		values := helmValues.Options{
-			Values: []string{
-				"gfd.enabled=true",
-				"nfd.enabled=true",
-				"devicePlugin.enabled=false",
+	// static patch payload (JSON MergePatch)
+	patch, _ := json.Marshal(map[string]any{
+		"metadata": map[string]any{
+			"labels": map[string]string{
+				"nvidia.com/gpu.present": "true",
 			},
-		}
+		},
+	})
 
-		chartSpec := &helm.ChartSpec{
-			ReleaseName:     "gfd",
-			ChartName:       "gfd/nvidia-device-plugin",
-			Namespace:       testNamespace.Name,
-			CreateNamespace: false,
-			ValuesOptions:   values,
-			Wait:            true,
-			Timeout:         5 * time.Minute,
-			CleanupOnFail:   true,
+	for _, n := range nodes.Items {
+		_, err := clientSet.CoreV1().
+			Nodes().
+			Patch(ctx, n.Name, types.MergePatchType, patch, metav1.PatchOptions{})
+		if err != nil {
+			return fmt.Errorf("failed to patch node %s: %v", n.Name, err)
 		}
-		_, err = helmClient.InstallOrUpgradeChart(ctx, chartSpec, nil)
-		Expect(err).NotTo(HaveOccurred())
 	}
+
+	return nil
 }
 
 // setHelmValuesOptions sets the Helm values options