Merge branch 'test/support_specify_docker_image' into 'master'

CI: support specify docker image with bot

See merge request !1586
This commit is contained in:
Ivan Grokhotkov 2018-01-10 15:41:46 +08:00
commit d082bf0697

View file

@ -75,7 +75,7 @@ before_script:
build_template_app: build_template_app:
stage: build stage: build
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
tags: tags:
- build - build
variables: variables:
@ -102,7 +102,7 @@ build_template_app:
.build_template: &build_template .build_template: &build_template
stage: build stage: build
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
tags: tags:
- build - build
variables: variables:
@ -190,7 +190,7 @@ build_examples_07:
build_docs: build_docs:
stage: build stage: build
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
tags: tags:
- build_docs - build_docs
artifacts: artifacts:
@ -212,7 +212,7 @@ build_docs:
test_nvs_on_host: test_nvs_on_host:
stage: test stage: test
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
tags: tags:
- nvs_host_test - nvs_host_test
dependencies: [] dependencies: []
@ -222,7 +222,7 @@ test_nvs_on_host:
test_partition_table_on_host: test_partition_table_on_host:
stage: test stage: test
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
tags: tags:
- build - build
dependencies: [] dependencies: []
@ -232,7 +232,7 @@ test_partition_table_on_host:
test_wl_on_host: test_wl_on_host:
stage: test stage: test
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
tags: tags:
- wl_host_test - wl_host_test
artifacts: artifacts:
@ -245,7 +245,7 @@ test_wl_on_host:
test_multi_heap_on_host: test_multi_heap_on_host:
stage: test stage: test
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
tags: tags:
- wl_host_test - wl_host_test
script: script:
@ -254,7 +254,7 @@ test_multi_heap_on_host:
test_build_system: test_build_system:
stage: test stage: test
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
tags: tags:
- build_test - build_test
dependencies: [] dependencies: []
@ -267,7 +267,7 @@ test_build_system:
test_report: test_report:
stage: test_report stage: test_report
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
tags: tags:
- report - report
only: only:
@ -321,7 +321,7 @@ test_report:
push_master_to_github: push_master_to_github:
stage: deploy stage: deploy
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
tags: tags:
- deploy - deploy
only: only:
@ -351,7 +351,7 @@ push_master_to_github:
deploy_docs: deploy_docs:
stage: deploy stage: deploy
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
tags: tags:
- deploy - deploy
only: only:
@ -378,7 +378,7 @@ deploy_docs:
check_doc_links: check_doc_links:
stage: test stage: test
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
tags: tags:
- check_doc_links - check_doc_links
only: only:
@ -398,7 +398,7 @@ check_doc_links:
check_commit_msg: check_commit_msg:
stage: deploy stage: deploy
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
tags: tags:
- build - build
except: except:
@ -415,7 +415,7 @@ check_commit_msg:
check_submodule_sync: check_submodule_sync:
stage: deploy stage: deploy
image: $CI_DOCKER_REGISTRY/esp32-ci-env image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
tags: tags:
- build - build
except: except: