E2E: Remove trafficGeneratorRuntimeClassName

Following the removal of the `trafficGeneratorRuntimeClassName` configuration parameter, there is no more need to define it in the E2E tests. Also remove the option to get it as an environment variable from the Makefile. Signed-off-by: Orel Misan <[email protected]>
kiagnose · Jul 10, 2023 · 90a6cef · 90a6cef
1 parent e278beb
commit 90a6cef
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -64,7 +64,6 @@ test/e2e:
 	           -e TEST_IMAGE=$(TEST_IMAGE) \
 	           -e TEST_NAMESPACE=$(TEST_NAMESPACE) \
 	           -e NETWORK_ATTACHMENT_DEFINITION_NAME=$(NETWORK_ATTACHMENT_DEFINITION_NAME) \
-	           -e RUNTIME_CLASS_NAME=$(RUNTIME_CLASS_NAME) \
 	           -e TRAFFIC_GEN_IMAGE_URL=$(TRAFFIC_GEN_IMAGE_URL) \
 	           -e VM_CONTAINER_DISK_IMAGE_URL=$(VM_CONTAINER_DISK_IMAGE_URL) \
 	           $(GO_IMAGE_NAME):$(GO_IMAGE_TAG) go test ./tests/... $(E2E_TEST_ARGS)

diff --git a/tests/checkup_test.go b/tests/checkup_test.go
@@ -282,12 +282,11 @@ func newConfigMap() *corev1.ConfigMap {
 		},
 		Data: map[string]string{
 			"spec.timeout": "10m",
-			"spec.param.networkAttachmentDefinitionName":  networkAttachmentDefinitionName,
-			"spec.param.trafficGeneratorRuntimeClassName": runtimeClassName,
-			"spec.param.trafficGeneratorImage":            trafficGeneratorImage,
-			"spec.param.vmContainerDiskImage":             vmContainerDiskImage,
-			"spec.param.testDuration":                     "1m",
-			"spec.param.verbose":                          "true",
+			"spec.param.networkAttachmentDefinitionName": networkAttachmentDefinitionName,
+			"spec.param.trafficGeneratorImage":           trafficGeneratorImage,
+			"spec.param.vmContainerDiskImage":            vmContainerDiskImage,
+			"spec.param.testDuration":                    "1m",
+			"spec.param.verbose":                         "true",
 		},
 	}
 }

diff --git a/tests/test_suite_test.go b/tests/test_suite_test.go
@@ -38,7 +38,6 @@ const (
 	namespaceEnvVarName                    = "TEST_NAMESPACE"
 	imageEnvVarName                        = "TEST_IMAGE"
 	networkAttachmentDefinitionNameVarName = "NETWORK_ATTACHMENT_DEFINITION_NAME"
-	runtimeClassNameVarName                = "RUNTIME_CLASS_NAME"
 	trafficGeneratorImageVarName           = "TRAFFIC_GEN_IMAGE_URL"
 	vmContainerDiskImageEnvVarName         = "VM_CONTAINER_DISK_IMAGE_URL"
 )
@@ -47,15 +46,13 @@ const (
 	defaultNamespace                       = "kiagnose-demo"
 	defaultImageName                       = "quay.io/kiagnose/kubevirt-dpdk-checkup:main"
 	defaultNetworkAttachmentDefinitionName = "intel-dpdk-network-1"
-	defaultRuntimeClassName                = "performance-performance-zeus10"
 )
 
 var (
 	virtClient                      kubecli.KubevirtClient
 	testNamespace                   string
 	testImageName                   string
 	networkAttachmentDefinitionName string
-	runtimeClassName                string
 	trafficGeneratorImage           string
 	vmContainerDiskImage            string
 )
@@ -80,10 +77,6 @@ var _ = BeforeSuite(func() {
 		networkAttachmentDefinitionName = defaultNetworkAttachmentDefinitionName
 	}
 
-	if runtimeClassName = os.Getenv(runtimeClassNameVarName); runtimeClassName == "" {
-		runtimeClassName = defaultRuntimeClassName
-	}
-
 	trafficGeneratorImage = os.Getenv(trafficGeneratorImageVarName)
 
 	vmContainerDiskImage = os.Getenv(vmContainerDiskImageEnvVarName)