Add merged target-test-env image

This commit is contained in:
Tomas Sebestik
2022-01-31 07:20:59 +01:00
parent 36c8dc59dd
commit fce2929083
4 changed files with 6 additions and 5 deletions

View File

@@ -61,6 +61,7 @@ variables:
ESP_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-env-v5.0:2" 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" 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" 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" SONARQUBE_SCANNER_IMAGE: "${CI_DOCKER_REGISTRY}/sonarqube-scanner:3"
LINUX_SHELL_IMAGE: "${CI_DOCKER_REGISTRY}/linux-shells-v5.0:2" LINUX_SHELL_IMAGE: "${CI_DOCKER_REGISTRY}/linux-shells-v5.0:2"

View File

@@ -1,5 +1,5 @@
.assign_test_template: .assign_test_template:
image: $CI_DOCKER_REGISTRY/ubuntu-test-env$BOT_DOCKER_IMAGE_TAG image: $TARGET_TEST_ENV_IMAGE
stage: assign_test stage: assign_test
tags: tags:
- assign_test - assign_test
@@ -108,7 +108,7 @@ assign_integration_test:
update_test_cases: update_test_cases:
extends: .rules:ref:master-schedule extends: .rules:ref:master-schedule
stage: assign_test stage: assign_test
image: $CI_DOCKER_REGISTRY/ubuntu-test-env image: $TARGET_TEST_ENV_IMAGE
tags: tags:
- deploy_test - deploy_test
needs: needs:

View File

@@ -144,7 +144,7 @@ scan_tests:
- .pre_check_base_template - .pre_check_base_template
- .before_script_pytest - .before_script_pytest
- .rules:build:target_test - .rules:build:target_test
image: $CI_DOCKER_REGISTRY/ubuntu-test-env$BOT_DOCKER_IMAGE_TAG image: $TARGET_TEST_ENV_IMAGE
tags: tags:
- assign_test - assign_test
artifacts: artifacts:

View File

@@ -1,4 +1,5 @@
.pytest_template: .pytest_template:
image: $TARGET_TEST_ENV_IMAGE
stage: target_test stage: target_test
timeout: 1 hour timeout: 1 hour
extends: .before_script_pytest extends: .before_script_pytest
@@ -176,6 +177,7 @@ component_ut_pytest_esp32c3_generic:
.target_test_job_template: .target_test_job_template:
stage: target_test stage: target_test
timeout: 1 hour timeout: 1 hour
image: $TARGET_TEST_ENV_IMAGE
artifacts: artifacts:
when: always when: always
paths: paths:
@@ -306,7 +308,6 @@ example_test_esp32_WIFI_OTA:
example_test_002: example_test_002:
extends: .example_test_esp32_template extends: .example_test_esp32_template
image: $CI_DOCKER_REGISTRY/ubuntu-test-env$BOT_DOCKER_IMAGE_TAG
tags: tags:
- ESP32 - ESP32
- Example_ShieldBox_Basic - Example_ShieldBox_Basic
@@ -345,7 +346,6 @@ example_test_006:
extends: extends:
- .example_test_esp32_template - .example_test_esp32_template
- .rules:labels:iperf_stress_test - .rules:labels:iperf_stress_test
image: $CI_DOCKER_REGISTRY/ubuntu-test-env$BOT_DOCKER_IMAGE_TAG
tags: tags:
- ESP32 - ESP32
- Example_ShieldBox - Example_ShieldBox