Merge pull request #119 from ArangoGutierrez/devel/fix_gha

Fix E2E tests data
NVIDIA · Sep 3, 2024 · f811579 · f811579
2 parents 39c6136 + 8088951
commit f811579
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/hack/e2e_tests.sh b/hack/e2e_tests.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright 2022 The Kubernetes Authors.
+# Copyright 2024 The Kubernetes Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -58,9 +58,9 @@ if [ -z "${KUBECONFIG:-}" ]; then
 fi
 
 # Set all ENV variables for e2e tests
-export ENABLE_NFD ENABLE_GPU_OPERATOR ENABLE_LOCAL_PATH_PROVISIONER
-export COLLECT_LOGS_FROM LOG_ARTIFACT_DIR HELM_CHART
-export E2E_IMAGE_REPO E2E_IMAGE_TAG E2E_IMAGE_PULL_POLICY
+export ENABLE_NFD ENABLE_GPU_OPERATOR ENABLE_LOCAL_PATH_PROVISIONER \
+  COLLECT_LOGS_FROM LOG_ARTIFACT_DIR HELM_CHART \
+  E2E_IMAGE_REPO E2E_IMAGE_TAG E2E_IMAGE_PULL_POLICY
 
 # shellcheck disable=SC2086
 $GINKGO $GINKGO_ARGS -v ./test/e2e/...
diff --git a/test/e2e/data/nimcache.yml b/test/e2e/data/nimcache.yml
@@ -5,18 +5,25 @@ metadata:
     app.kubernetes.io/name: k8s-nim-operator
   name: meta-llama3-8b-instruct
 spec:
-  resources: {}
   source:
     ngc:
       modelPuller: nvcr.io/nim/meta/llama3-8b-instruct:1.0.0
       pullSecret: ngc-secret
       authSecret: ngc-api-secret
       model:
         profiles: []
-        precision: "fp8"
+        lora: false
+        precision: "fp16"
         engine: "tensorrt_llm"
         qosProfile: "throughput"
+        gpus:
+          - product: "A100"
+            ids:
+              - "20b2"
         tensorParallelism: "1"
+  resources:
+    cpu: 500m
+    memory: 20Gi
   storage:
     pvc:
       create: true

diff --git a/test/e2e/data/nimservice.yml b/test/e2e/data/nimservice.yml
@@ -1,8 +1,6 @@
 apiVersion: apps.nvidia.com/v1alpha1
 kind: NIMService
 metadata:
-  labels:
-    app.kubernetes.io/name: k8s-nim-operator
   name: meta-llama3-8b-instruct
 spec:
   image:

diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
@@ -146,11 +146,11 @@ var _ = BeforeSuite(func() {
 // AfterSuite runs after the test suite
 var _ = AfterSuite(func() {
 	// Clean up CRs so they are garbage collected by their controllers
-	cleanUpCRs()
+	cleanupCRs()
 	// Clean up Helm deployments
 	cleanup()
 	// Remove CRDs
-	cleanuoCRDs()
+	cleanupCRDs()
 	// Delete Test Namespace
 	DeleteNamespace()
 })

diff --git a/test/e2e/nim-operator_test.go b/test/e2e/nim-operator_test.go
@@ -85,7 +85,7 @@ var _ = Describe("NIM Operator", func() {
 			cleanup()
 		}
 		// Clean up
-		cleanUpCRs()
+		cleanupCRs()
 		cleanup()
 	})
 
@@ -162,7 +162,7 @@ func cleanup() {
 	}
 }
 
-func cleanUpCRs() {
+func cleanupCRs() {
 	cli, err := versioned.NewForConfig(clientConfig)
 	Expect(err).NotTo(HaveOccurred())
 
@@ -206,7 +206,7 @@ func cleanUpCRs() {
 	}
 }
 
-func cleanuoCRDs() {
+func cleanupCRDs() {
 	crds := []string{
 		"nimcaches.apps.nvidia.com",
 		"nimservices.apps.nvidia.com",