Skip to content

Commit 4b36540

Browse files
committed
ci: cleanup pipeline rules
- disable allow_failure for build jobs and master tests - retry all test jobs - drop build dependency on style check - set RUNNER_SCRIPT_TIMEOUT for tests
1 parent c53e9b9 commit 4b36540

File tree

3 files changed

+12
-40
lines changed

3 files changed

+12
-40
lines changed

.gitlab/ci/build-test-app.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,7 @@
134134
- *finish_test_app_build
135135
- *prepare_espytrace_package
136136
- *prepare_sysview_config
137-
dependencies: []
138-
needs:
139-
- job: style_check
137+
needs: []
140138

141139
.build_idf50x_test_app_template: &build_idf50x_test_app_template
142140
stage: build_idf5.0.x
@@ -180,7 +178,6 @@
180178

181179
.build_idf_master_test_app_template: &build_idf_master_test_app_template
182180
stage: build_idf_master
183-
allow_failure: true
184181
variables:
185182
TEST_APP_CONFIGS: ""
186183
TEST_APP_IDF_DOCKER_IMAGE: "${TEST_APP_IDF_LATEST_DOCKER_IMAGE}"
@@ -655,8 +652,7 @@ build_nuttx_app:
655652
project: idf/apache/esp-nuttx-apps
656653
strategy: depend
657654
allow_failure: true
658-
needs:
659-
- job: style_check
655+
needs: []
660656
parallel:
661657
matrix:
662658
- TRIGGER_JOB: [openocd-esp32, openocd-esp32s2, openocd-esp32s3, openocd-esp32c3, openocd-esp32c6, openocd-esp32h2]

.gitlab/ci/build.yml

+8-22
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@
110110
- ${DIST_ART_DIR}
111111
when: always
112112
expire_in: 2 weeks
113-
needs:
114-
- job: style_check
113+
needs: []
115114
script:
116115
- *get_release_name
117116
- export HOST_CC=${CONF_HOST}-gcc
@@ -140,8 +139,7 @@
140139
paths:
141140
- ${DIST_ART_DIR}
142141
expire_in: 2 weeks
143-
needs:
144-
- job: style_check
142+
needs: []
145143
script:
146144
- *get_release_name
147145
- *buildx_libusb
@@ -167,8 +165,7 @@ build_linux:
167165
PLATFORM_NAME: "linux-amd64"
168166
CONF_HOST: "x86_64-linux-gnu"
169167
HOST_CC: ${CONF_HOST}-gcc
170-
needs:
171-
- job: style_check
168+
needs: []
172169
script:
173170
- *get_release_name
174171
- apt-get update || true
@@ -192,9 +189,7 @@ build_linux_gcc_latest:
192189
stage: build_openocd
193190
tags:
194191
- build
195-
allow_failure: true
196-
needs:
197-
- job: style_check
192+
needs: []
198193
variables:
199194
CONF_HOST: ""
200195
HOST_CC: "gcc"
@@ -266,8 +261,7 @@ build_linux_arm64_test:
266261
CONF_HOST: "i686-w64-mingw32"
267262
INSTALL_TARGET: "install-strip"
268263
HOST_CC: ${CONF_HOST}-gcc
269-
needs:
270-
- job: style_check
264+
needs: []
271265
script:
272266
- *get_release_name
273267
- *buildx_libusb
@@ -312,7 +306,6 @@ scan-build:
312306
stage: static_analyzers
313307
tags:
314308
- build
315-
allow_failure: true
316309
variables:
317310
SCAN_BUILD_OUTPUT: "report"
318311
CONF_HOST: ""
@@ -342,7 +335,6 @@ sparse:
342335
stage: static_analyzers
343336
tags:
344337
- build
345-
allow_failure: true
346338
variables:
347339
SPARSE_BUILD_OUTDIR: "sparse"
348340
SPARSE_BUILD_OUTFILE: "warnings.log"
@@ -373,9 +365,7 @@ build_linux_cmake:
373365
stage: build_openocd
374366
tags:
375367
- build
376-
allow_failure: true
377-
needs:
378-
- job: style_check
368+
needs: []
379369
variables:
380370
OPENOCD_CMAKE_CONFIGURE_OPTS: ""
381371
script:
@@ -390,9 +380,7 @@ build_linux_cmake:
390380
image: $CI_DOCKER_REGISTRY/esp32-toolchain-arm-cross:3
391381
tags:
392382
- build
393-
allow_failure: true
394-
needs:
395-
- job: style_check
383+
needs: []
396384
variables:
397385
OPENOCD_CMAKE_CONFIGURE_OPTS: ""
398386
script:
@@ -407,9 +395,7 @@ build_linux_cmake:
407395
image: $CI_DOCKER_REGISTRY/esp32-toolchain-win-cross
408396
tags:
409397
- build
410-
allow_failure: true
411-
needs:
412-
- job: style_check
398+
needs: []
413399
variables:
414400
OPENOCD_CMAKE_CONFIGURE_OPTS: ""
415401
script:

.gitlab/ci/test.yml

+2-12
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
- $CHIP_NAME
44
- jtag
55
variables:
6+
RUNNER_SCRIPT_TIMEOUT: 60m
67
PLATFORM_NAME: "linux-armhf-test"
78
OOCD_CMDS: "set VAR 1" # default command to avoid missing argument error.
8-
TEST_RUN_RETRY: "-r"
9-
TEST_RUN_EXTRA_OPTS: "${TEST_RUN_RETRY} -i ${IDF_RELEASE_TAG} ${TEST_RUN_BOARD_OPTS} ${TEST_RUN_COMMON_ARGS}"
9+
TEST_RUN_EXTRA_OPTS: "-r -i ${IDF_RELEASE_TAG} ${TEST_RUN_BOARD_OPTS} ${TEST_RUN_COMMON_ARGS}"
1010
artifacts:
1111
paths:
1212
- $TEST_RUN_DIR/debug_backend_tests.log
@@ -55,20 +55,14 @@
5555
.tests_armhf_master_template:
5656
extends: .tests_armhf_template
5757
stage: test_idf_master
58-
allow_failure: true
5958
image: $CI_DOCKER_REGISTRY/target-test-env-v5.5:2
60-
inherit:
61-
default:
62-
- interruptible
63-
# Dont retry
6459
variables:
6560
CHIP_TEST_TOOLCHAIN: "xtensa-${CHIP_NAME}"
6661
ESP_GDB_TOOLCHAIN: "${ESP_V5_5X_XTENSA_GDB_TOOLCHAIN}"
6762
TOOLCHAIN_PREFIX: "xtensa-esp"
6863
ESP_TOOLCHAIN: "${ESP_V5_5X_TOOLCHAIN_VER}"
6964
TEST_RUN_DIR: "build_test_app_${CHIP_NAME}"
7065
IDF_RELEASE_TAG: "latest"
71-
TEST_RUN_RETRY: "" # Dont retry
7266
ESP_GCOV_TOOLCHAIN: "${ESP_V5_5X_XTENSA_GCOV_TOOLCHAIN}-arm-linux-gnueabihf"
7367

7468
.tests_arm64_master_template:
@@ -1111,10 +1105,6 @@ tests_on_linux:
11111105
extends: .tests_armhf_v5.1.x_template
11121106
stage: test_nuttx
11131107
allow_failure: true
1114-
inherit:
1115-
default:
1116-
- interruptible
1117-
# Dont retry
11181108
variables:
11191109
RUNNER_SCRIPT_TIMEOUT: 5m
11201110
TEST_RUN_DIR: "build_test_app_${CHIP_NAME}_nuttx_test"

0 commit comments

Comments
 (0)