Skip to content

Commit 4d10ff7

Browse files
sobuchsobuch
committed
ci: fixes for v6.0 and tag pipelines
1 parent 70a9bc3 commit 4d10ff7

File tree

3 files changed

+12
-30
lines changed

3 files changed

+12
-30
lines changed

‎.gitlab-ci.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ pipeline_variables:
101101
echo "TRIGGERED_BY_GDB_PIPELINE_BRANCH=${TRIGGERED_BY_GDB_PIPELINE_BRANCH:-}" >> variables.env;
102102
if [[ ! -z ${TRIGGERED_BY_GDB_PIPELINE_BRANCH:-} ]]; then
103103
echo "CI_FULL_RUN=0" >> variables.env;
104-
elif [[ $CI_PIPELINE_SOURCE != "push" || ${CI_COMMIT_BRANCH:-} == "master" ]]; then
104+
elif [[ $CI_PIPELINE_SOURCE != "push" || ${CI_COMMIT_BRANCH:-} == "master" || ! -z ${CI_COMMIT_TAG:-} ]]; then
105105
echo "CI_FULL_RUN=1" >> variables.env;
106106
else
107107
api_call="https://${CI_SERVER_HOST}:${CI_SERVER_PORT}/api/v4/projects/67/merge_requests?source_branch=${CI_COMMIT_REF_NAME}&state=opened";
@@ -221,6 +221,8 @@ test_idf_examples:
221221
stage: pre_release
222222
allow_failure: true
223223
rules:
224+
- if: $CI_COMMIT_TAG
225+
when: always
224226
- if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULE_TYPE == "run_idf_tests"
225227
when: always
226228
- if: $CI_COMMIT_BRANCH == "master"
@@ -260,6 +262,7 @@ create_reports:
260262
- job: 5.3.x_run_test_pipeline
261263
- job: 5.4.x_run_test_pipeline
262264
- job: 5.5.x_run_test_pipeline
265+
- job: 6.0.x_run_test_pipeline
263266
- job: master_run_test_pipeline
264267
# NuttX
265268
- job: test_nuttx_esp32

‎.gitlab/ci/downstream/idf_6_0_x/test.yml‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ tests_esp32_idf6.0.x:
66
job: build_linux_arm64_test
77
- pipeline: $PARENT_PIPELINE_ID
88
job: build_linux_armhf_test
9-
- job: fetch_gdb
10-
optional: true
119
variables:
1210
CHIP_NAME: "esp32"
1311
TEST_RUN_BOARD_OPTS: "-b esp32-wrover-kit-3.3v -e test_*.*Encrypted"
@@ -22,8 +20,6 @@ tests_esp32_idf6.0.x:
2220
job: build_linux_arm64_test
2321
- pipeline: $PARENT_PIPELINE_ID
2422
job: build_linux_armhf_test
25-
- job: fetch_gdb
26-
optional: true
2723
variables:
2824
CHIP_NAME: "esp32"
2925
TEST_RUN_BOARD_OPTS: "-b esp32-wrover-kit-3.3v -p test_*.*Encrypted"
@@ -36,8 +32,6 @@ tests_esp32s2_idf6.0.x:
3632
job: build_linux_arm64_test
3733
- pipeline: $PARENT_PIPELINE_ID
3834
job: build_linux_armhf_test
39-
- job: fetch_gdb
40-
optional: true
4135
variables:
4236
CHIP_NAME: "esp32s2"
4337
TEST_RUN_BOARD_OPTS: "-b esp32s2-devkitj -p test_*.*Single"
@@ -52,8 +46,6 @@ tests_esp32s2_idf6.0.x_flash_encrypted:
5246
job: build_linux_arm64_test
5347
- pipeline: $PARENT_PIPELINE_ID
5448
job: build_linux_armhf_test
55-
- job: fetch_gdb
56-
optional: true
5749
variables:
5850
CHIP_NAME: "esp32s2"
5951
TEST_RUN_BOARD_OPTS: "-b esp32s2-devkitj -p test_*.*SingleEncrypted"
@@ -66,8 +58,6 @@ tests_esp32s3_idf6.0.x_dual:
6658
job: build_linux_arm64_test
6759
- pipeline: $PARENT_PIPELINE_ID
6860
job: build_linux_armhf_test
69-
- job: fetch_gdb
70-
optional: true
7161
variables:
7262
CHIP_NAME: "esp32s3"
7363
TEST_RUN_BOARD_OPTS: "-b esp32s3-ftdi -p test_*.*Dual"
@@ -80,8 +70,6 @@ tests_esp32s3_idf6.0.x_single:
8070
job: build_linux_arm64_test
8171
- pipeline: $PARENT_PIPELINE_ID
8272
job: build_linux_armhf_test
83-
- job: fetch_gdb
84-
optional: true
8573
variables:
8674
CHIP_NAME: "esp32s3"
8775
OOCD_CMDS: "set ESP_ONLYCPU 1"
@@ -95,8 +83,6 @@ tests_esp32c2_idf6.0.x:
9583
job: build_linux_arm64_test
9684
- pipeline: $PARENT_PIPELINE_ID
9785
job: build_linux_armhf_test
98-
- job: fetch_gdb
99-
optional: true
10086
variables:
10187
CHIP_NAME: "esp32c2"
10288
TEST_RUN_BOARD_OPTS: "-b esp32c2-ftdi -p test_*.*Single4MB test_*.*Single"
@@ -109,8 +95,6 @@ tests_esp32c3_idf6.0.x:
10995
job: build_linux_arm64_test
11096
- pipeline: $PARENT_PIPELINE_ID
11197
job: build_linux_armhf_test
112-
- job: fetch_gdb
113-
optional: true
11498
variables:
11599
CHIP_NAME: "esp32c3"
116100
TEST_RUN_BOARD_OPTS: "-b esp32c3-ftdi -p test_*.*Single"
@@ -125,8 +109,6 @@ tests_esp32c3_idf6.0.x_flash_encrypted:
125109
job: build_linux_arm64_test
126110
- pipeline: $PARENT_PIPELINE_ID
127111
job: build_linux_armhf_test
128-
- job: fetch_gdb
129-
optional: true
130112
variables:
131113
CHIP_NAME: "esp32c3"
132114
TEST_RUN_BOARD_OPTS: "-b esp32c3-ftdi -p test_*.*SingleEncrypted"
@@ -142,8 +124,6 @@ tests_esp32c5_idf6.0.x:
142124
job: build_linux_arm64_test
143125
- pipeline: $PARENT_PIPELINE_ID
144126
job: build_linux_armhf_test
145-
- job: fetch_gdb
146-
optional: true
147127
variables:
148128
CHIP_NAME: "esp32c5"
149129
ESPTOOL_PORT: "/dev/serial_ports/ttyACM-esp32"
@@ -165,8 +145,6 @@ tests_esp32c6_idf6.0.x:
165145
job: build_linux_arm64_test
166146
- pipeline: $PARENT_PIPELINE_ID
167147
job: build_linux_armhf_test
168-
- job: fetch_gdb
169-
optional: true
170148
variables:
171149
CHIP_NAME: "esp32c6"
172150
ESPTOOL_PORT: "/dev/serial_ports/ttyACM-esp32"
@@ -189,8 +167,6 @@ tests_esp32c61_idf6.0.x:
189167
job: build_linux_arm64_test
190168
- pipeline: $PARENT_PIPELINE_ID
191169
job: build_linux_armhf_test
192-
- job: fetch_gdb
193-
optional: true
194170
variables:
195171
CHIP_NAME: "esp32c61"
196172
ESPTOOL_PORT: "/dev/serial_ports/ttyACM-esp32"
@@ -207,8 +183,6 @@ tests_esp32h2_idf6.0.x:
207183
job: build_linux_arm64_test
208184
- pipeline: $PARENT_PIPELINE_ID
209185
job: build_linux_armhf_test
210-
- job: fetch_gdb
211-
optional: true
212186
variables:
213187
CHIP_NAME: "esp32h2"
214188
ESPTOOL_PORT: "/dev/serial_ports/ttyACM-esp32"
@@ -222,8 +196,6 @@ tests_esp32p4_idf6.0.x:
222196
job: build_linux_arm64_test
223197
- pipeline: $PARENT_PIPELINE_ID
224198
job: build_linux_armhf_test
225-
- job: fetch_gdb
226-
optional: true
227199
variables:
228200
CHIP_NAME: "esp32p4"
229201
TEST_RUN_BOARD_OPTS: "-b esp32p4-ftdi -e test_*.LpCore* test_*.*Encrypted"

‎.gitlab/ci/idf-examples.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ create_target_branches:
4747
tags: [ "build", "shiny" ]
4848
script:
4949
- >
50-
for branch in "master" "${TEST_APP_IDF5_1_RELEASE_BRANCH}" "${TEST_APP_IDF5_2_RELEASE_BRANCH}" "${TEST_APP_IDF5_3_RELEASE_BRANCH}" "${TEST_APP_IDF5_4_RELEASE_BRANCH}" "${TEST_APP_IDF5_5_RELEASE_BRANCH}"; do
50+
for branch in "master" "${TEST_APP_IDF5_2_RELEASE_BRANCH}" "${TEST_APP_IDF5_3_RELEASE_BRANCH}" "${TEST_APP_IDF5_4_RELEASE_BRANCH}" "${TEST_APP_IDF5_5_RELEASE_BRANCH}" ${TEST_APP_IDF6_0_RELEASE_BRANCH}; do
5151
encoded_branch="${IDF_TEMP_BRANCH_PREFIX}${branch//\//%2F}"
5252
api_call_delete="https://${CI_SERVER_HOST}:${CI_SERVER_PORT}/api/v4/projects/103/repository/branches/${encoded_branch}"
5353
echo "${api_call_delete}"
@@ -80,6 +80,13 @@ test_idf_master_examples:
8080
<<: *trigger_esp_idf
8181
branch: "${IDF_TEMP_BRANCH_PREFIX}master"
8282

83+
test_idf6.0.x_examples:
84+
extends:
85+
- .test_idf_examples
86+
trigger:
87+
<<: *trigger_esp_idf
88+
branch: ${IDF_TEMP_BRANCH_PREFIX}${TEST_APP_IDF6_0_RELEASE_BRANCH}
89+
8390
test_idf5.5.x_examples:
8491
extends:
8592
- .test_idf_examples

0 commit comments

Comments
 (0)