ci: combine unit_test and integration_test stage:

The number of runners of integration test is not bottleneck to CI
pipeline performance now. Combine these 2 stages will make integration
test executed even unit test fails. This could help us to collect more
info about test history.
This commit is contained in:
He Yin Ling
2018-11-26 16:40:32 +08:00
parent ab8e4069b5
commit 61ecee012e

View File

@ -2,8 +2,7 @@ stages:
- build - build
- assign_test - assign_test
- host_test - host_test
- unit_test - target_test
- integration_test
- deploy - deploy
- post_check - post_check
@ -657,7 +656,7 @@ assign_test:
- python CIAssignTestCases.py -t $IDF_PATH/components/idf_test/integration_test -c $IDF_PATH/.gitlab-ci.yml -b $IDF_PATH/SSC/ssc_bin - python CIAssignTestCases.py -t $IDF_PATH/components/idf_test/integration_test -c $IDF_PATH/.gitlab-ci.yml -b $IDF_PATH/SSC/ssc_bin
.example_test_template: &example_test_template .example_test_template: &example_test_template
stage: integration_test stage: target_test
when: on_success when: on_success
only: only:
refs: refs:
@ -713,7 +712,7 @@ assign_test:
.unit_test_template: &unit_test_template .unit_test_template: &unit_test_template
<<: *example_test_template <<: *example_test_template
stage: unit_test stage: target_test
dependencies: dependencies:
- assign_test - assign_test
- build_esp_idf_tests - build_esp_idf_tests
@ -735,7 +734,7 @@ assign_test:
ENV_FILE: "$CI_PROJECT_DIR/ci-test-runner-configs/$CI_RUNNER_DESCRIPTION/EnvConfig.yml" ENV_FILE: "$CI_PROJECT_DIR/ci-test-runner-configs/$CI_RUNNER_DESCRIPTION/EnvConfig.yml"
.test_template: &test_template .test_template: &test_template
stage: integration_test stage: target_test
when: on_success when: on_success
only: only:
refs: refs: