@@ -150,9 +150,6 @@ endif
150150GENERATED_SKIP_OPT += $(if $(SKIP ) ,-ginkgo.skip "$(SKIP ) ")
151151ADDITIONAL_FOCUS_REGEX := $(if $(FOCUS ) ,$(FOCUS ) .* $(ADDITIONAL_FOCUS_REGEX ) ,$(ADDITIONAL_FOCUS_REGEX ) )
152152
153- e2e-fpga :
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
155-
156153e2e-qat :
157154 @$(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
158155
@@ -168,9 +165,6 @@ e2e-dsa:
168165e2e-iaa :
169166 @$(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
170167
171- e2e-dlb :
172- @$(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
173-
174168e2e-spr :
175169 @$(GO ) test -v ./test/e2e/... -ginkgo.v -ginkgo.show-node-events -ginkgo.focus " Device:(iaa|dsa)|Device:qat.*Mode:dpdk.*Resource:(cy|dc).*" -ginkgo.focus " Device:sgx.*|(SGX Admission)" -ginkgo.focus " Device:gpu.*Resource:i915" $(GENERATED_SKIP_OPT ) -delete-namespace-on-failure=false
176170
@@ -183,7 +177,7 @@ endif
183177
184178dockerlib = build/docker/lib
185179dockertemplates = build/docker/templates
186- images = $(shell basename -s .Dockerfile.in -a $(dockertemplates ) /* .Dockerfile.in)
180+ images = $(shell basename -s .Dockerfile.in -a $(dockertemplates ) /* .Dockerfile.in | grep -v -e dlb -e fpga -e kerneldrv )
187181dockerfiles = $(shell basename -s .in -a $(dockertemplates ) /* .Dockerfile.in | xargs -I"{}" echo build/docker/{})
188182
189183test-image-base-layer :
@@ -213,7 +207,7 @@ $(images): $(dockerfiles)
213207
214208images : $(images )
215209
216- demos = $(shell basename -a demo/* /)
210+ demos = $(shell basename -a demo/* / | grep -v -e dlb -e opae-nlb-demo )
217211
218212$(demos ) :
219213 @cd demo/ && ./build-image.sh $(REG ) $@ $(BUILDER )
0 commit comments