Skip to content

Commit 3727c3c

Browse files
committed
Merge branch 'ci/reduce_ci_test_time_by_half' into 'master'
CI: Reduce ci test time by half See merge request adf/esp-adf-internal!1416
2 parents 3046c60 + 41d1b72 commit 3727c3c

File tree

2 files changed

+42
-13
lines changed

2 files changed

+42
-13
lines changed

.gitlab/ci/target-ut-test.yml

Lines changed: 38 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@
2222
expire_in: 1 week
2323
variables:
2424
IDF_VERSION_TAG: default
25+
TEST_DIR: /builds/adf/esp-adf-internal/components/esp-adf-libs
26+
BUILD_JOB_PREFIX: build_pytest_components_
27+
IDF_TARGET: esp32s3
28+
needs:
29+
- 'esp_adf_libs_components_test'
30+
retry: 2
2531
before_script:
2632
- source ${ADF_PATH}/tools/ci/utils.sh
2733
- check_idf_version $IDF_VERSION_TAG
@@ -45,13 +51,11 @@
4551
- if: $CI_PIPELINE_SOURCE == "triggers"
4652
- if: $CI_PIPELINE_SOURCE == "schedules"
4753
extends: .pytest_ut_template
48-
needs:
49-
- 'esp_adf_libs_components_test'
50-
variables:
51-
TEST_DIR: /builds/adf/esp-adf-internal/components/esp-adf-libs
52-
BUILD_JOB_PREFIX: build_pytest_components_
53-
IDF_TARGET: esp32s3
54-
retry: 2
54+
55+
.pytest_components_dir_schedule_template:
56+
extends:
57+
- .rules:ref:master-schedule
58+
- .pytest_ut_template
5559

5660
pytest_components_esp32s3_ut_01:
5761
extends:
@@ -77,27 +81,48 @@ pytest_components_esp32s3_ut_03:
7781
pytest_components_esp32s3_ut_04:
7882
extends:
7983
- .pytest_components_dir_template
80-
tags: [ ESP32S3, UT_T1_AUDIO_L3 ]
84+
tags: [ ESP32S3, UT_T1_AUDIO_L6 ]
8185
variables:
82-
TEST_ENV: "UT_T1_AUDIO_L3"
86+
TEST_ENV: "UT_T1_AUDIO_L6"
8387

8488
pytest_components_esp32s3_ut_05:
8589
extends:
8690
- .pytest_components_dir_template
87-
tags: [ ESP32S3, UT_T1_AUDIO_L4 ]
91+
tags: [ ESP32S3, UT_T1_AUDIO_L7 ]
8892
variables:
89-
TEST_ENV: "UT_T1_AUDIO_L4"
93+
TEST_ENV: "UT_T1_AUDIO_L7"
9094

9195
pytest_components_esp32s3_ut_06:
9296
extends:
9397
- .pytest_components_dir_template
94-
tags: [ ESP32S3, UT_T1_AUDIO_L5 ]
98+
tags: [ ESP32S3, UT_T1_AUDIO_L8 ]
9599
variables:
96-
TEST_ENV: "UT_T1_AUDIO_L5"
100+
TEST_ENV: "UT_T1_AUDIO_L8"
97101

98102
pytest_components_esp32s3_ut_07:
103+
extends:
104+
- .pytest_components_dir_template
105+
tags: [ ESP32S3, UT_T1_AUDIO_L9 ]
106+
variables:
107+
TEST_ENV: "UT_T1_AUDIO_L9"
108+
109+
pytest_components_esp32s3_ut_08:
99110
extends:
100111
- .pytest_components_dir_template
101112
tags: [ ESP32S3, UT_T1_AUDIO_E6 ]
102113
variables:
103114
TEST_ENV: "UT_T1_AUDIO_E6"
115+
116+
pytest_components_esp32s3_ut_9:
117+
extends:
118+
- .pytest_components_dir_schedule_template
119+
tags: [ ESP32S3, UT_T1_AUDIO_L4 ]
120+
variables:
121+
TEST_ENV: "UT_T1_AUDIO_L4"
122+
123+
pytest_components_esp32s3_ut_10:
124+
extends:
125+
- .pytest_components_dir_schedule_template
126+
tags: [ ESP32S3, UT_T1_AUDIO_L5 ]
127+
variables:
128+
TEST_ENV: "UT_T1_AUDIO_L5"

conftest.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@
5555
'UT_T1_AUDIO_L3': 'Tests should be run on UT_T1_AUDIO_L3 runners.',
5656
'UT_T1_AUDIO_L4': 'Tests should be run on UT_T1_AUDIO_L4 runners.',
5757
'UT_T1_AUDIO_L5': 'Tests should be run on UT_T1_AUDIO_L5 runners.',
58+
'UT_T1_AUDIO_L6': 'Tests should be run on UT_T1_AUDIO_L6 runners.',
59+
'UT_T1_AUDIO_L7': 'Tests should be run on UT_T1_AUDIO_L7 runners.',
60+
'UT_T1_AUDIO_L8': 'Tests should be run on UT_T1_AUDIO_L8 runners.',
61+
'UT_T1_AUDIO_L9': 'Tests should be run on UT_T1_AUDIO_L9 runners.',
5862
'UT_T1_AUDIO_E6': 'Tests should be run on UT_T1_AUDIO_E6 runners.',
5963
'AUDIO_LOOPBACK_ENV': 'Audio loopback testing verifies the functionality by comparing the audio input signal with the output signal.',
6064
}

0 commit comments

Comments
 (0)