@@ -140,29 +140,39 @@ REG?=$(ORG)/
140140TAG? =devel
141141export TAG
142142
143+ ifeq ($(E2E_LEVEL ) , $(filter $(E2E_LEVEL ) , full) )
144+ GENERATED_SKIP_OPT =-ginkgo.skip "App:noapp"
145+ else ifeq ($(E2E_LEVEL),basic)
146+ ADDITIONAL_FOCUS_REGEX =App:noapp
147+ else
148+ $(error Unsupported E2E_LEVEL value : $(E2E_LEVEL ) . Possible options: full, basic)
149+ endif
150+ GENERATED_SKIP_OPT += $(if $(SKIP ) ,-ginkgo.skip "$(SKIP ) ")
151+ ADDITIONAL_FOCUS_REGEX := $(if $(FOCUS ) ,$(FOCUS ) .* $(ADDITIONAL_FOCUS_REGEX ) ,$(ADDITIONAL_FOCUS_REGEX ) )
152+
143153e2e-fpga :
144- @$(GO ) test -v ./test/e2e/... -ginkgo.v -ginkgo.show-node-events -ginkgo.focus " FPGA " -delete-namespace-on-failure=false
154+ @$(GO ) test -v ./test/e2e/... -ginkgo.v -ginkgo.show-node-events -ginkgo.focus " Device:fpga.* $( ADDITIONAL_FOCUS_REGEX ) " $( GENERATED_SKIP_OPT ) -delete-namespace-on-failure=false
145155
146156e2e-qat :
147- @$(GO ) test -v ./test/e2e/... -ginkgo.v -ginkgo.show-node-events -ginkgo.focus " QAT Gen2 " -delete-namespace-on-failure=false
157+ @$(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
148158
149159e2e-qat4 :
150- @$(GO ) test -v ./test/e2e/... -ginkgo.v -ginkgo.show-node-events -ginkgo.focus " QAT Gen4 " -ginkgo.skip " dpdk crypto-perf " -delete-namespace-on-failure=false
160+ @$(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
151161
152162e2e-sgx :
153- @$(GO ) test -v ./test/e2e/... -ginkgo.v -ginkgo.show-node-events -ginkgo.focus " SGX " -delete-namespace-on-failure=false
163+ @$(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
154164
155165e2e-gpu :
156- @$(GO ) test -v ./test/e2e/... -ginkgo.v -ginkgo.show-node-events -ginkgo.focus " GPU " -delete-namespace-on-failure=false
166+ @$(GO ) test -v ./test/e2e/... -ginkgo.v -ginkgo.show-node-events -ginkgo.focus " Device:gpu.* $( ADDITIONAL_FOCUS_REGEX ) " $( GENERATED_SKIP_OPT ) -delete-namespace-on-failure=false
157167
158168e2e-dsa :
159- @$(GO ) test -v ./test/e2e/... -ginkgo.v -ginkgo.show-node-events -ginkgo.focus " DSA " -delete-namespace-on-failure=false
169+ @$(GO ) test -v ./test/e2e/... -ginkgo.v -ginkgo.show-node-events -ginkgo.focus " Device:dsa.* $( ADDITIONAL_FOCUS_REGEX ) " $( GENERATED_SKIP_OPT ) -delete-namespace-on-failure=false
160170
161171e2e-iaa :
162- @$(GO ) test -v ./test/e2e/... -ginkgo.v -ginkgo.show-node-events -ginkgo.focus " IAA " -delete-namespace-on-failure=false
172+ @$(GO ) test -v ./test/e2e/... -ginkgo.v -ginkgo.show-node-events -ginkgo.focus " Device:iaa.* $( ADDITIONAL_FOCUS_REGEX ) " $( GENERATED_SKIP_OPT ) -delete-namespace-on-failure=false
163173
164174e2e-dlb :
165- @$(GO ) test -v ./test/e2e/... -ginkgo.v -ginkgo.show-node-events -ginkgo.focus " DLB " -delete-namespace-on-failure=false
175+ @$(GO ) test -v ./test/e2e/... -ginkgo.v -ginkgo.show-node-events -ginkgo.focus " Device:dlb.* $( ADDITIONAL_FOCUS_REGEX ) " $( GENERATED_SKIP_OPT ) -delete-namespace-on-failure=false
166176
167177terrascan :
168178 @ls deployments/* /kustomization.yaml | while read f ; \
0 commit comments