Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

Commit d082bf0

Browse files
committed
Merge branch 'test/support_specify_docker_image' into 'master'
CI: support specify docker image with bot See merge request !1586
2 parents e9ca1dc + 3ad64bc commit d082bf0

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

.gitlab-ci.yml

+14-14
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ before_script:
7575

7676
build_template_app:
7777
stage: build
78-
image: $CI_DOCKER_REGISTRY/esp32-ci-env
78+
image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
7979
tags:
8080
- build
8181
variables:
@@ -102,7 +102,7 @@ build_template_app:
102102

103103
.build_template: &build_template
104104
stage: build
105-
image: $CI_DOCKER_REGISTRY/esp32-ci-env
105+
image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
106106
tags:
107107
- build
108108
variables:
@@ -190,7 +190,7 @@ build_examples_07:
190190

191191
build_docs:
192192
stage: build
193-
image: $CI_DOCKER_REGISTRY/esp32-ci-env
193+
image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
194194
tags:
195195
- build_docs
196196
artifacts:
@@ -212,7 +212,7 @@ build_docs:
212212

213213
test_nvs_on_host:
214214
stage: test
215-
image: $CI_DOCKER_REGISTRY/esp32-ci-env
215+
image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
216216
tags:
217217
- nvs_host_test
218218
dependencies: []
@@ -222,7 +222,7 @@ test_nvs_on_host:
222222

223223
test_partition_table_on_host:
224224
stage: test
225-
image: $CI_DOCKER_REGISTRY/esp32-ci-env
225+
image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
226226
tags:
227227
- build
228228
dependencies: []
@@ -232,7 +232,7 @@ test_partition_table_on_host:
232232

233233
test_wl_on_host:
234234
stage: test
235-
image: $CI_DOCKER_REGISTRY/esp32-ci-env
235+
image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
236236
tags:
237237
- wl_host_test
238238
artifacts:
@@ -245,7 +245,7 @@ test_wl_on_host:
245245

246246
test_multi_heap_on_host:
247247
stage: test
248-
image: $CI_DOCKER_REGISTRY/esp32-ci-env
248+
image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
249249
tags:
250250
- wl_host_test
251251
script:
@@ -254,7 +254,7 @@ test_multi_heap_on_host:
254254

255255
test_build_system:
256256
stage: test
257-
image: $CI_DOCKER_REGISTRY/esp32-ci-env
257+
image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
258258
tags:
259259
- build_test
260260
dependencies: []
@@ -267,7 +267,7 @@ test_build_system:
267267

268268
test_report:
269269
stage: test_report
270-
image: $CI_DOCKER_REGISTRY/esp32-ci-env
270+
image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
271271
tags:
272272
- report
273273
only:
@@ -321,7 +321,7 @@ test_report:
321321

322322
push_master_to_github:
323323
stage: deploy
324-
image: $CI_DOCKER_REGISTRY/esp32-ci-env
324+
image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
325325
tags:
326326
- deploy
327327
only:
@@ -351,7 +351,7 @@ push_master_to_github:
351351

352352
deploy_docs:
353353
stage: deploy
354-
image: $CI_DOCKER_REGISTRY/esp32-ci-env
354+
image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
355355
tags:
356356
- deploy
357357
only:
@@ -378,7 +378,7 @@ deploy_docs:
378378

379379
check_doc_links:
380380
stage: test
381-
image: $CI_DOCKER_REGISTRY/esp32-ci-env
381+
image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
382382
tags:
383383
- check_doc_links
384384
only:
@@ -398,7 +398,7 @@ check_doc_links:
398398

399399
check_commit_msg:
400400
stage: deploy
401-
image: $CI_DOCKER_REGISTRY/esp32-ci-env
401+
image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
402402
tags:
403403
- build
404404
except:
@@ -415,7 +415,7 @@ check_commit_msg:
415415

416416
check_submodule_sync:
417417
stage: deploy
418-
image: $CI_DOCKER_REGISTRY/esp32-ci-env
418+
image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
419419
tags:
420420
- build
421421
except:

0 commit comments

Comments
 (0)