Skip to content

Commit 9a9219d

Browse files
Davo911Davo911
committed
push test images as operator images
Signed-off-by: Thomas-David Griedel [email protected]
1 parent d71a929 commit 9a9219d

File tree

4 files changed

+167
-18
lines changed

4 files changed

+167
-18
lines changed

‎BUILD.bazel‎

Lines changed: 129 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -105,20 +105,139 @@ container_bundle(
105105

106106
load("@io_bazel_rules_docker//contrib:push-all.bzl", "docker_push")
107107

108+
container_push(
109+
name = "push-cdi-func-test-bad-webserver",
110+
format = "Docker",
111+
image = "//tools/cdi-func-test-bad-webserver:cdi-func-test-bad-webserver-image",
112+
registry = "$(container_prefix)",
113+
repository = "cdi-func-test-bad-webserver",
114+
tag = "$(container_tag)",
115+
)
116+
117+
container_push(
118+
name = "push-cdi-func-test-proxy",
119+
format = "Docker",
120+
image = "//tools/cdi-func-test-proxy:cdi-func-test-proxy-image",
121+
registry = "$(container_prefix)",
122+
repository = "cdi-func-test-proxy",
123+
tag = "$(container_tag)",
124+
)
125+
126+
container_push(
127+
name = "push-cdi-func-test-sample-populator",
128+
format = "Docker",
129+
image = "//tools/cdi-func-test-sample-populator:cdi-func-test-sample-populator-image",
130+
registry = "$(container_prefix)",
131+
repository = "cdi-func-test-sample-populator",
132+
tag = "$(container_tag)",
133+
)
134+
135+
container_push(
136+
name = "push-cdi-func-test-file-host-init",
137+
format = "Docker",
138+
image = "//tools/cdi-func-test-file-host-init:cdi-func-test-file-host-init-image",
139+
registry = "$(container_prefix)",
140+
repository = "cdi-func-test-file-host-init",
141+
tag = "$(container_tag)",
142+
)
143+
144+
container_push(
145+
name = "push-cdi-func-test-file-host-http",
146+
format = "Docker",
147+
image = "//tools/cdi-func-test-file-host-init:cdi-func-test-file-host-http-image",
148+
registry = "$(container_prefix)",
149+
repository = "cdi-func-test-file-host-http",
150+
tag = "$(container_tag)",
151+
)
152+
153+
container_push(
154+
name = "push-cdi-func-test-registry-init",
155+
format = "Docker",
156+
image = "//tools/cdi-func-test-registry-init:cdi-func-test-registry-init-image",
157+
registry = "$(container_prefix)",
158+
repository = "cdi-func-test-registry-init",
159+
tag = "$(container_tag)",
160+
)
161+
162+
container_push(
163+
name = "push-cdi-func-test-registry-populate",
164+
format = "Docker",
165+
image = "//tools/cdi-func-test-registry-init:cdi-func-test-registry-populate-image",
166+
registry = "$(container_prefix)",
167+
repository = "cdi-func-test-registry-populate",
168+
tag = "$(container_tag)",
169+
)
170+
171+
container_push(
172+
name = "push-cdi-func-test-registry",
173+
format = "Docker",
174+
image = "//tools/cdi-func-test-registry-init:cdi-func-test-registry-image",
175+
registry = "$(container_prefix)",
176+
repository = "cdi-func-test-registry",
177+
tag = "$(container_tag)",
178+
)
179+
180+
container_push(
181+
name = "push-imageio-init",
182+
format = "Docker",
183+
image = "//tools/imageio-init:imageio-init-image",
184+
registry = "$(container_prefix)",
185+
repository = "imageio-init",
186+
tag = "$(container_tag)",
187+
)
188+
189+
container_push(
190+
name = "push-vcenter-simulator",
191+
format = "Docker",
192+
image = "//tools/vddk-test:vcenter-simulator",
193+
registry = "$(container_prefix)",
194+
repository = "vcenter-simulator",
195+
tag = "$(container_tag)",
196+
)
197+
198+
container_push(
199+
name = "push-vddk-init",
200+
format = "Docker",
201+
image = "//tools/vddk-init:vddk-init-image",
202+
registry = "$(container_prefix)",
203+
repository = "vddk-init",
204+
tag = "$(container_tag)",
205+
)
108206

207+
container_push(
208+
name = "push-vddk-test",
209+
format = "Docker",
210+
image = "//tools/vddk-test:vddk-test-image",
211+
registry = "$(container_prefix)",
212+
repository = "vddk-test",
213+
tag = "$(container_tag)",
214+
)
109215

110-
alias(
111-
name = "test-container-images",
112-
actual = select({
113-
"@io_bazel_rules_go//go/platform:linux_s390x":":test-container-images-s390x",
114-
"@io_bazel_rules_go//go/platform:linux_arm64":":test-container-images-aarch64",
115-
"//conditions:default": ":test-container-images-amd64",
116-
})
216+
container_push(
217+
name = "push-cdi-func-test-tinycore",
218+
format = "Docker",
219+
image = "//tests:cdi-func-test-tinycore",
220+
registry = "$(container_prefix)",
221+
repository = "cdi-func-test-tinycore",
222+
tag = "$(container_tag)",
117223
)
118224

119-
docker_push(
120-
name = "push-test-images",
121-
bundle = ":test-container-images",
225+
container_push(
226+
name = "push-cdi-func-test-imageio",
227+
format = "Docker",
228+
image = "//tools/image-io:cdi-func-test-imageio-image",
229+
registry = "$(container_prefix)",
230+
repository = "cdi-func-test-imageio",
231+
tag = "$(container_tag)",
232+
)
233+
234+
container_push(
235+
name = "push-cdi-func-test-cirros-qcow2",
236+
format = "Docker",
237+
image = "//tests:cdi-func-test-cirros-qcow2",
238+
registry = "$(container_prefix)",
239+
repository = "cdi-func-test-cirros-qcow2",
240+
tag = "$(container_tag)",
122241
)
123242

124243
container_push(

‎hack/build/bazel-build-images.sh‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,28 @@ for tag in ${docker_tag}; do
3131
--define container_prefix=${docker_prefix} \
3232
--define container_tag=${tag} \
3333
--host_force_python=PY3 \
34-
//:test-container-images //cmd/cdi-operator:cdi-operator-image //cmd/cdi-controller:cdi-controller-image //cmd/cdi-apiserver:cdi-apiserver-image //cmd/cdi-cloner:cdi-cloner-image //cmd/cdi-importer:cdi-importer-image //cmd/cdi-uploadproxy:cdi-uploadproxy-image //cmd/cdi-uploadserver:cdi-uploadserver-image
34+
//tools/cdi-func-test-bad-webserver:cdi-func-test-bad-webserver-image \
35+
//tools/cdi-func-test-proxy:cdi-func-test-proxy-image \
36+
//tools/cdi-func-test-sample-populator:cdi-func-test-sample-populator-image \
37+
//tools/cdi-func-test-file-host-init:cdi-func-test-file-host-init-image \
38+
//tools/cdi-func-test-file-host-init:cdi-func-test-file-host-http-image \
39+
//tools/cdi-func-test-registry-init:cdi-func-test-registry-init-image \
40+
//tools/cdi-func-test-registry-init:cdi-func-test-registry-populate-image \
41+
//tools/cdi-func-test-registry-init:cdi-func-test-registry-image \
42+
//tools/imageio-init:imageio-init-image \
43+
//tools/vddk-test:vcenter-simulator \
44+
//tools/vddk-init:vddk-init-image \
45+
//tools/vddk-test:vddk-test-image \
46+
//tests:cdi-func-test-tinycore \
47+
//tools/image-io:cdi-func-test-imageio-image \
48+
//tests:cdi-func-test-cirros-qcow2 \
49+
//cmd/cdi-operator:cdi-operator-image \
50+
//cmd/cdi-controller:cdi-controller-image \
51+
//cmd/cdi-apiserver:cdi-apiserver-image \
52+
//cmd/cdi-cloner:cdi-cloner-image \
53+
//cmd/cdi-importer:cdi-importer-image \
54+
//cmd/cdi-uploadproxy:cdi-uploadproxy-image \
55+
//cmd/cdi-uploadserver:cdi-uploadserver-image
3556
done
3657

3758
rm -rf ${DIGESTS_DIR}/${ARCHITECTURE}

‎hack/build/bazel-push-images.sh‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ fi
2828

2929
PUSH_TARGETS=(${PUSH_TARGETS:-$CONTROLLER_IMAGE_NAME $IMPORTER_IMAGE_NAME $CLONER_IMAGE_NAME $APISERVER_IMAGE_NAME $UPLOADPROXY_IMAGE_NAME $UPLOADSERVER_IMAGE_NAME $OPERATOR_IMAGE_NAME})
3030

31+
TEST_PUSH_TARGETS=(${TEST_PUSH_TARGETS:-$FUNC_TEST_INIT $FUNC_TEST_HTTP $FUNC_TEST_REGISTRY $FUNC_TEST_REGISTRY_POPULATE $FUNC_TEST_REGISTRY_INIT $FUNC_TEST_BAD_WEBSERVER $FUNC_TEST_PROXY $FUNC_TEST_POPULATOR $FUNC_TEST_IMAGEIO $FUNC_TEST_IMAGEIO_INIT $FUNC_TEST_VCENTER_SIMULATOR})
32+
3133
echo "docker_prefix: $DOCKER_PREFIX, docker_tag: $DOCKER_TAG"
3234
for target in ${PUSH_TARGETS[@]}; do
3335
echo "Pushing: $target"
@@ -40,13 +42,17 @@ for target in ${PUSH_TARGETS[@]}; do
4042
//:push-${target}
4143
done
4244

43-
bazel run \
44-
--verbose_failures \
45-
--config=${ARCHITECTURE} \
46-
--define container_prefix=${DOCKER_PREFIX} \
47-
--define container_tag=${DOCKER_TAG} \
48-
--host_force_python=PY3 \
49-
//:push-test-images
45+
# Push test images
46+
for target in ${TEST_PUSH_TARGETS[@]}; do
47+
echo "Pushing test image: $target"
48+
bazel run \
49+
--verbose_failures \
50+
--config=${ARCHITECTURE} \
51+
--define container_prefix=${DOCKER_PREFIX} \
52+
--define container_tag=${DOCKER_TAG} \
53+
--host_force_python=PY3 \
54+
//:push-${target}
55+
done
5056

5157
rm -rf ${DIGESTS_DIR}/${ARCHITECTURE}
5258
mkdir -p ${DIGESTS_DIR}/${ARCHITECTURE}

‎hack/build/config.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ FUNC_TEST_REGISTRY_INIT="cdi-func-test-registry-init"
2727
FUNC_TEST_BAD_WEBSERVER="cdi-func-test-bad-webserver"
2828
FUNC_TEST_PROXY="cdi-func-test-proxy"
2929
FUNC_TEST_POPULATOR="cdi-func-test-sample-populator"
30+
FUNC_TEST_IMAGEIO_INIT="imageio-init"
31+
FUNC_TEST_IMAGEIO="cdi-func-test-imageio"
32+
FUNC_TEST_VCENTER_SIMULATOR="vcenter-simulator"
3033

3134
# update this whenever new builder tag is created
3235
BUILDER_IMAGE=${BUILDER_IMAGE:-quay.io/kubevirt/kubevirt-cdi-bazel-builder:2503021312-67d1f3d4d}

0 commit comments

Comments
 (0)