e2e,qat4: use 'dc' 'cy' and 'generic'

Strictly speaking, 'Gen4' and 'Gen2' are wrong expressions in this case,
because Gen4 resources are read as 'generic' in VMs. To prevent any
confusion, use just the names of the QAT services such as 'dc', 'cy' or
'generic'

Signed-off-by: Hyeongju Johannes Lee <hyeongju.lee@intel.com>

Author: hj-johannes-lee

.github/workflows/lib-e2e.yaml

@@ -34,9 +34,11 @@ jobs:
             runner: simics-gnr
             images: intel-iaa-plugin intel-idxd-config-initcontainer accel-config-demo intel-deviceplugin-operator
           - name: e2e-qat
+            targetjob: e2e-qat FOCUS=Resource:generic
             runner: qat
             images: intel-qat-plugin intel-qat-initcontainer crypto-perf
           - name: e2e-qat4
+            targetjob: e2e-qat FOCUS="Mode:dpdk.*Resource:(cy|dc)" SKIP=App:crypto-perf
             runner: simics-spr
             images: intel-qat-plugin intel-qat-initcontainer openssl-qat-engine
           - name: e2e-sgx

Makefile

@@ -156,9 +156,6 @@ e2e-fpga:
 e2e-qat:
 	@$(GO) test -v ./test/e2e/... -ginkgo.v -ginkgo.show-node-events -ginkgo.focus "Device:qat.*$(ADDITIONAL_FOCUS_REGEX)" $(GENERATED_SKIP_OPT) -delete-namespace-on-failure=false
 
-e2e-qat4:
-	@$(GO) test -v ./test/e2e/... -ginkgo.v -ginkgo.show-node-events -ginkgo.focus "Device:qat4.*$(ADDITIONAL_FOCUS_REGEX)" $(GENERATED_SKIP_OPT) -delete-namespace-on-failure=false
-
 e2e-sgx:
 	@$(GO) test -v ./test/e2e/... -ginkgo.v -ginkgo.show-node-events -ginkgo.focus "Device:sgx.*$(ADDITIONAL_FOCUS_REGEX)" $(GENERATED_SKIP_OPT) -delete-namespace-on-failure=false
 

test/e2e/qat/qatplugin_dpdk.go

@@ -118,7 +118,7 @@ func describeQatDpdkPlugin() {
 		}
 	})
 
-	ginkgo.Context("When QAT Gen4 resources are available with crypto (cy) services enabled [Resource:cy]", func() {
+	ginkgo.Context("When QAT resources are available with crypto (cy) services enabled [Resource:cy]", func() {
 		// This BeforeEach runs even before the JustBeforeEach above.
 		ginkgo.BeforeEach(func() {
 			ginkgo.By("creating a configMap before plugin gets deployed")
@@ -146,7 +146,7 @@ func describeQatDpdkPlugin() {
 		})
 	})
 
-	ginkgo.Context("When QAT Gen4 resources are available with compress (dc) services enabled [Resource:dc]", func() {
+	ginkgo.Context("When QAT resources are available with compress (dc) services enabled [Resource:dc]", func() {
 		ginkgo.BeforeEach(func() {
 			ginkgo.By("creating a configMap before plugin gets deployed")
 			e2ekubectl.RunKubectlOrDie(f.Namespace.Name, "create", "configmap", "--from-literal", "qat.conf=ServicesEnabled=dc", "qat-config")
@@ -164,9 +164,9 @@ func describeQatDpdkPlugin() {
 		})
 	})
 
-	ginkgo.Context("When QAT Gen2 resources are available [Resource:generic]", func() {
+	ginkgo.Context("When QAT resources are available [Resource:generic]", func() {
 		ginkgo.BeforeEach(func() {
-			ginkgo.By("setting resourceName for Gen2 resources")
+			ginkgo.By("setting resourceName for generic resources")
 			resourceName = "qat.intel.com/generic"
 		})