Merge branch 'ci/combine_unit_test_and_integration_test' into 'master'

ci: combine unit_test and integration_test stage

See merge request idf/esp-idf!3792
This commit is contained in:
Angus Gratton 2018-12-03 11:39:26 +08:00
commit 80e6def4b8

View File

@ -2,8 +2,7 @@ stages:
- build
- assign_test
- host_test
- unit_test
- integration_test
- target_test
- check
- deploy
- post_check
@ -815,7 +814,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
.example_test_template: &example_test_template
stage: integration_test
stage: target_test
when: on_success
only:
refs:
@ -871,7 +870,7 @@ assign_test:
.unit_test_template: &unit_test_template
<<: *example_test_template
stage: unit_test
stage: target_test
dependencies:
- assign_test
- build_esp_idf_tests_make
@ -894,7 +893,7 @@ assign_test:
ENV_FILE: "$CI_PROJECT_DIR/ci-test-runner-configs/$CI_RUNNER_DESCRIPTION/EnvConfig.yml"
.test_template: &test_template
stage: integration_test
stage: target_test
when: on_success
only:
refs: