Skip to content

Commit c5b7194

Browse files
authored
Merge pull request #1977 from tkatila/disable-dlb-fpga
build: drop dlb and fpga related images
2 parents c12b577 + 52c9c5c commit c5b7194

File tree

4 files changed

+2
-29
lines changed

4 files changed

+2
-29
lines changed

Diff for: .github/workflows/lib-build.yaml

-9
Original file line numberDiff line numberDiff line change
@@ -13,37 +13,28 @@ jobs:
1313
strategy:
1414
matrix:
1515
image:
16-
- intel-fpga-admissionwebhook
17-
- intel-fpga-initcontainer
1816
- intel-gpu-fakedev
1917
- intel-gpu-initcontainer
2018
- intel-gpu-plugin
2119
- intel-gpu-levelzero
22-
- intel-fpga-plugin
2320
- intel-qat-initcontainer
2421
- intel-qat-plugin
25-
- intel-qat-plugin-kerneldrv
2622
- intel-deviceplugin-operator
2723
- intel-sgx-admissionwebhook
2824
- intel-sgx-plugin
2925
- intel-sgx-initcontainer
3026
- intel-dsa-plugin
3127
- intel-iaa-plugin
3228
- intel-idxd-config-initcontainer
33-
- intel-dlb-plugin
34-
- intel-dlb-initcontainer
3529
- intel-xpumanager-sidecar
3630

3731
# # Demo images
3832
- crypto-perf
3933
- accel-config-demo
4034
- intel-opencl-icd
41-
- opae-nlb-demo
4235
- openssl-qat-engine
4336
- sgx-sdk-demo
4437
- sgx-aesmd-demo
45-
- dlb-dpdk-demo
46-
- dlb-libdlb-demo
4738
builder: [buildah, docker]
4839
steps:
4940
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4

Diff for: .github/workflows/lib-e2e.yaml

-7
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,6 @@ jobs:
3434
- intel-qat-plugin
3535
- intel-qat-initcontainer
3636
- openssl-qat-engine
37-
- name: e2e-fpga
38-
runner: fpga
39-
images:
40-
- intel-fpga-plugin
41-
- intel-fpga-initcontainer
42-
- intel-fpga-admissionwebhook
43-
- opae-nlb-demo
4437
- name: e2e-spr
4538
targetjob: e2e-spr SKIP="App:compress-perf"
4639
runner: spr

Diff for: .github/workflows/lib-publish.yaml

-5
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,9 @@ jobs:
4444
fail-fast: false
4545
matrix:
4646
image:
47-
- intel-fpga-admissionwebhook
48-
- intel-fpga-initcontainer
4947
- intel-gpu-initcontainer
5048
- intel-gpu-plugin
5149
- intel-gpu-levelzero
52-
- intel-fpga-plugin
5350
- intel-qat-initcontainer
5451
- intel-qat-plugin
5552
- intel-deviceplugin-operator
@@ -59,8 +56,6 @@ jobs:
5956
- intel-dsa-plugin
6057
- intel-iaa-plugin
6158
- intel-idxd-config-initcontainer
62-
- intel-dlb-plugin
63-
- intel-dlb-initcontainer
6459
- intel-xpumanager-sidecar
6560
steps:
6661
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4

Diff for: Makefile

+2-8
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,6 @@ endif
150150
GENERATED_SKIP_OPT += $(if $(SKIP),-ginkgo.skip "$(SKIP)")
151151
ADDITIONAL_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-
156153
e2e-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:
168165
e2e-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-
174168
e2e-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

184178
dockerlib = build/docker/lib
185179
dockertemplates = 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)
187181
dockerfiles = $(shell basename -s .in -a $(dockertemplates)/*.Dockerfile.in | xargs -I"{}" echo build/docker/{})
188182

189183
test-image-base-layer:
@@ -213,7 +207,7 @@ $(images): $(dockerfiles)
213207

214208
images: $(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

Comments
 (0)