diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1742591fe3..4b5063d59f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,6 +61,7 @@ variables: ESP_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-env-v5.0:2" AFL_FUZZER_TEST_IMAGE: "$CI_DOCKER_REGISTRY/afl-fuzzer-test-v5.0:2-1" CLANG_STATIC_ANALYSIS_IMAGE: "${CI_DOCKER_REGISTRY}/clang-static-analysis-v5.0:2-1" + TARGET_TEST_ENV_IMAGE: "$CI_DOCKER_REGISTRY/target-test-env-v5.0:1" SONARQUBE_SCANNER_IMAGE: "${CI_DOCKER_REGISTRY}/sonarqube-scanner:3" LINUX_SHELL_IMAGE: "${CI_DOCKER_REGISTRY}/linux-shells-v5.0:2" diff --git a/.gitlab/ci/assign-test.yml b/.gitlab/ci/assign-test.yml index 0eb68b5502..df0951d575 100644 --- a/.gitlab/ci/assign-test.yml +++ b/.gitlab/ci/assign-test.yml @@ -1,5 +1,5 @@ .assign_test_template: - image: $CI_DOCKER_REGISTRY/ubuntu-test-env$BOT_DOCKER_IMAGE_TAG + image: $TARGET_TEST_ENV_IMAGE stage: assign_test tags: - assign_test @@ -108,7 +108,7 @@ assign_integration_test: update_test_cases: extends: .rules:ref:master-schedule stage: assign_test - image: $CI_DOCKER_REGISTRY/ubuntu-test-env + image: $TARGET_TEST_ENV_IMAGE tags: - deploy_test needs: diff --git a/.gitlab/ci/pre_check.yml b/.gitlab/ci/pre_check.yml index 89ae879f80..6fb3761d5a 100644 --- a/.gitlab/ci/pre_check.yml +++ b/.gitlab/ci/pre_check.yml @@ -144,7 +144,7 @@ scan_tests: - .pre_check_base_template - .before_script_pytest - .rules:build:target_test - image: $CI_DOCKER_REGISTRY/ubuntu-test-env$BOT_DOCKER_IMAGE_TAG + image: $TARGET_TEST_ENV_IMAGE tags: - assign_test artifacts: diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml index 1f3af141e4..277df150b5 100644 --- a/.gitlab/ci/target-test.yml +++ b/.gitlab/ci/target-test.yml @@ -1,4 +1,5 @@ .pytest_template: + image: $TARGET_TEST_ENV_IMAGE stage: target_test timeout: 1 hour extends: .before_script_pytest @@ -176,6 +177,7 @@ component_ut_pytest_esp32c3_generic: .target_test_job_template: stage: target_test timeout: 1 hour + image: $TARGET_TEST_ENV_IMAGE artifacts: when: always paths: @@ -306,7 +308,6 @@ example_test_esp32_WIFI_OTA: example_test_002: extends: .example_test_esp32_template - image: $CI_DOCKER_REGISTRY/ubuntu-test-env$BOT_DOCKER_IMAGE_TAG tags: - ESP32 - Example_ShieldBox_Basic @@ -345,7 +346,6 @@ example_test_006: extends: - .example_test_esp32_template - .rules:labels:iperf_stress_test - image: $CI_DOCKER_REGISTRY/ubuntu-test-env$BOT_DOCKER_IMAGE_TAG tags: - ESP32 - Example_ShieldBox