From 3ad64bc0990672197198fb4b727fc76d0a01d8cd Mon Sep 17 00:00:00 2001 From: He Yin Ling Date: Thu, 23 Nov 2017 10:13:14 +0800 Subject: [PATCH] CI: support sepcify docker image tag with bot --- .gitlab-ci.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5c0545c23..32f1db581 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -75,7 +75,7 @@ before_script: build_template_app: stage: build - image: $CI_DOCKER_REGISTRY/esp32-ci-env + image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG tags: - build variables: @@ -102,7 +102,7 @@ build_template_app: .build_template: &build_template stage: build - image: $CI_DOCKER_REGISTRY/esp32-ci-env + image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG tags: - build variables: @@ -182,7 +182,7 @@ build_examples_06: build_docs: stage: build - image: $CI_DOCKER_REGISTRY/esp32-ci-env + image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG tags: - build_docs artifacts: @@ -204,7 +204,7 @@ build_docs: test_nvs_on_host: stage: test - image: $CI_DOCKER_REGISTRY/esp32-ci-env + image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG tags: - nvs_host_test dependencies: [] @@ -214,7 +214,7 @@ test_nvs_on_host: test_partition_table_on_host: stage: test - image: $CI_DOCKER_REGISTRY/esp32-ci-env + image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG tags: - build dependencies: [] @@ -224,7 +224,7 @@ test_partition_table_on_host: test_wl_on_host: stage: test - image: $CI_DOCKER_REGISTRY/esp32-ci-env + image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG tags: - wl_host_test artifacts: @@ -237,7 +237,7 @@ test_wl_on_host: test_multi_heap_on_host: stage: test - image: $CI_DOCKER_REGISTRY/esp32-ci-env + image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG tags: - wl_host_test script: @@ -246,7 +246,7 @@ test_multi_heap_on_host: test_build_system: stage: test - image: $CI_DOCKER_REGISTRY/esp32-ci-env + image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG tags: - build_test dependencies: [] @@ -259,7 +259,7 @@ test_build_system: test_report: stage: test_report - image: $CI_DOCKER_REGISTRY/esp32-ci-env + image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG tags: - report only: @@ -313,7 +313,7 @@ test_report: push_master_to_github: stage: deploy - image: $CI_DOCKER_REGISTRY/esp32-ci-env + image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG tags: - deploy only: @@ -343,7 +343,7 @@ push_master_to_github: deploy_docs: stage: deploy - image: $CI_DOCKER_REGISTRY/esp32-ci-env + image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG tags: - deploy only: @@ -370,7 +370,7 @@ deploy_docs: check_doc_links: stage: test - image: $CI_DOCKER_REGISTRY/esp32-ci-env + image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG tags: - check_doc_links only: @@ -390,7 +390,7 @@ check_doc_links: check_commit_msg: stage: deploy - image: $CI_DOCKER_REGISTRY/esp32-ci-env + image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG tags: - build except: @@ -407,7 +407,7 @@ check_commit_msg: check_submodule_sync: stage: deploy - image: $CI_DOCKER_REGISTRY/esp32-ci-env + image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG tags: - build except: