Merge pull request #1077 from elezar/rework-device-plugin-tests

[no-relnotes] Only install device plugin once

Author: elezar

tests/e2e/device-plugin_test.go

@@ -94,10 +94,7 @@ var _ = NVDescribe("GPU Device Plugin", func() {
 			// Create clients for apiextensions and our CRD api
 			extClient = extclient.NewForConfigOrDie(f.ClientConfig())
 			helmReleaseName = "nvdp-e2e-test" + rand.String(5)
-		})
 
-		JustBeforeEach(func(ctx context.Context) {
-			// reset Helm Client
 			chartSpec = helm.ChartSpec{
 				ReleaseName:   helmReleaseName,
 				ChartName:     *HelmChart,
@@ -113,6 +110,9 @@ var _ = NVDescribe("GPU Device Plugin", func() {
 			Expect(err).NotTo(HaveOccurred())
 		})
 
+		JustBeforeEach(func(ctx context.Context) {
+		})
+
 		AfterEach(func(ctx context.Context) {
 			// Run diagnostic collector if test failed
 			if CurrentSpecReport().Failed() {
@@ -128,17 +128,19 @@ var _ = NVDescribe("GPU Device Plugin", func() {
 				err = diagnosticsCollector.Collect(ctx)
 				Expect(err).NotTo(HaveOccurred())
 			}
-			// Cleanup before next test run
+		})
+
+		AfterAll(func(ctx context.Context) {
 			// Delete Helm release
 			err := f.HelmClient.UninstallReleaseByName(helmReleaseName)
 			Expect(err).NotTo(HaveOccurred())
-		})
 
-		AfterAll(func(ctx context.Context) {
 			for _, crd := range crds {
 				err := extClient.ApiextensionsV1().CustomResourceDefinitions().Delete(ctx, crd.Name, metav1.DeleteOptions{})
 				Expect(err).NotTo(HaveOccurred())
 			}
+
+			// TODO: Add a check for a zero node capacity.
 		})
 
 		Context("and NV Driver is installed", func() {