prpl/prplMesh
1
0
Fork 0
mirror of https://gitlab.com/prpl-foundation/prplmesh/prplMesh.git synced 2025-12-20 01:21:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

CI: prevent nightly jobs from running in merge trains

Browse Source 
Due to Gitlab CI changes, non-defined variables expanded to its variable name in the platform child pipeline.
The CI checks the existence of some CI variable contents in order to run nightly test jobs in a pipeline.
Expanding this non-defined variable meant failure for merge trains, since these nightly jobs are not meant to always run.

Solution: change the check for non-defined variables in nightly jobs

Signed-off-by: Maarten De Decker <maarten.dedecker@mind.be>
This commit is contained in:
Maarten De Decker
2025-11-18 16:31:59 +01:00
parent 65002ba526
commit 4177f31a5b
2 changed files with 6 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
.gitlab-ci.yml
View File

@@ -30,6 +30,9 @@ include:
- if: '$CI_PIPELINE_SOURCE == "schedule"' - if: '$CI_PIPELINE_SOURCE == "schedule"'
- if: '$CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"' - if: '$CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"'
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
- if: ($TESTS_TO_RUN_ESSENSIUM && $TESTS_TO_RUN_ESSENSIUM !~ /^\$/)
- if: ($TESTS_TO_RUN_R2_ESSENSIUM && $TESTS_TO_RUN_R2_ESSENSIUM !~ /^\$/)
- if: ($TESTS_TO_RUN_R4_ESSENSIUM && $TESTS_TO_RUN_R4_ESSENSIUM !~ /^\$/)
- when: manual - when: manual
allow_failure: true allow_failure: true
@@ -58,18 +61,14 @@ platform:
- !reference [.rules-for-expensive-job, rules] - !reference [.rules-for-expensive-job, rules]
variables: variables:
STABILITY_TESTS: $STABILITY_TESTS STABILITY_TESTS: $STABILITY_TESTS
ALTRAN_TESTS: $ALTRAN_TESTS
TESTS_TO_RUN_ESSENSIUM: $TESTS_TO_RUN_ESSENSIUM TESTS_TO_RUN_ESSENSIUM: $TESTS_TO_RUN_ESSENSIUM
DEVICE_UNDER_TEST_ESSENSIUM: $DEVICE_UNDER_TEST_ESSENSIUM DEVICE_UNDER_TEST_ESSENSIUM: $DEVICE_UNDER_TEST_ESSENSIUM
TESTS_TO_RUN_ISR: $TESTS_TO_RUN_ISR
DEVICE_UNDER_TEST_ISR: $DEVICE_UNDER_TEST_ISR
TESTS_TO_RUN_R2_ESSENSIUM: $TESTS_TO_RUN_R2_ESSENSIUM TESTS_TO_RUN_R2_ESSENSIUM: $TESTS_TO_RUN_R2_ESSENSIUM
DEVICE_UNDER_TEST_R2_ESSENSIUM: $DEVICE_UNDER_TEST_R2_ESSENSIUM DEVICE_UNDER_TEST_R2_ESSENSIUM: $DEVICE_UNDER_TEST_R2_ESSENSIUM
TESTS_TO_RUN_R4_ESSENSIUM: $TESTS_TO_RUN_R4_ESSENSIUM TESTS_TO_RUN_R4_ESSENSIUM: $TESTS_TO_RUN_R4_ESSENSIUM
DEVICE_UNDER_TEST_R4_ESSENSIUM: $DEVICE_UNDER_TEST_R4_ESSENSIUM DEVICE_UNDER_TEST_R4_ESSENSIUM: $DEVICE_UNDER_TEST_R4_ESSENSIUM
PARENT_PIPELINE_ID: $CI_PIPELINE_ID PARENT_PIPELINE_ID: $CI_PIPELINE_ID
CI_PARENT_PIPELINE_SOURCE: $CI_PIPELINE_SOURCE CI_PARENT_PIPELINE_SOURCE: $CI_PIPELINE_SOURCE
BUILD_CGR: $BUILD_CGR
trigger: trigger:
include: "ci/platform.yml" include: "ci/platform.yml"
strategy: depend strategy: depend
@@ -298,16 +297,3 @@ boardfarm-stability-tests:
rules: rules:
- if: "$STABILITY_TESTS" - if: "$STABILITY_TESTS"
retry: 0 retry: 0
run-certification-tests-R1-prplmesh-essensium:
extends: .run-certification-tests-R1
before_script:
- !reference [.run-certification-tests-R1, before_script]
- echo "$TESTS_TO_RUN_ESSENSIUM" > .tests-to-run
- echo "$DEVICE_UNDER_TEST_ESSENSIUM" > .device-under-test
tags:
- certs-tests-essensium
needs:
- job: build-in-docker
rules:
- if: '$TESTS_TO_RUN_ESSENSIUM !~ /^\$/ && $DEVICE_UNDER_TEST_ESSENSIUM == "prplmesh"'

23
ci/platform.yml
View File

@@ -118,17 +118,6 @@ build-for-osp-ospv2:
tags: tags:
- osp-build-fetch - osp-build-fetch
build-for-cgr:
stage: build
variables:
PRPLMESH_REVISION: $CI_COMMIT_SHA
trigger:
project: essensium-mind/prplmesh/puma7
strategy: depend
needs: []
rules:
- if: '$CI_PARENT_PIPELINE_SOURCE == "schedule" && $BUILD_CGR == "yes"'
test-upgrade-image-on-turris-omnia: test-upgrade-image-on-turris-omnia:
extends: .test-upgrade-image extends: .test-upgrade-image
variables: variables:
@@ -242,9 +231,7 @@ run-certification-tests-R1-platform-essensium:
- job: build-for-turris-omnia - job: build-for-turris-omnia
- job: build-for-haze - job: build-for-haze
rules: rules:
- if: '$TESTS_TO_RUN_ESSENSIUM != "" && $DEVICE_UNDER_TEST_ESSENSIUM != "prplmesh"' - if: '$TESTS_TO_RUN_ESSENSIUM !~ /^\$/ && $DEVICE_UNDER_TEST_ESSENSIUM != "prplmesh"'
- when: manual
allow_failure: true
run-certification-tests-R2-platform-essensium: run-certification-tests-R2-platform-essensium:
extends: .run-certification-tests-R2 extends: .run-certification-tests-R2
@@ -253,9 +240,7 @@ run-certification-tests-R2-platform-essensium:
- echo "$TESTS_TO_RUN_R2_ESSENSIUM" > .tests-to-run - echo "$TESTS_TO_RUN_R2_ESSENSIUM" > .tests-to-run
- echo "$DEVICE_UNDER_TEST_R2_ESSENSIUM" > .device-under-test - echo "$DEVICE_UNDER_TEST_R2_ESSENSIUM" > .device-under-test
rules: rules:
- if: '$TESTS_TO_RUN_R2_ESSENSIUM != "" && $DEVICE_UNDER_TEST_R2_ESSENSIUM != "prplmesh"' - if: '$TESTS_TO_RUN_R2_ESSENSIUM !~ /^\$/ && $DEVICE_UNDER_TEST_R2_ESSENSIUM != "prplmesh"'
- when: manual
allow_failure: true
timeout: 14h timeout: 14h
tags: tags:
- certs-tests-R2-essensium - certs-tests-R2-essensium
@@ -269,9 +254,7 @@ run-certification-tests-R4-platform-essensium:
- echo "$TESTS_TO_RUN_R4_ESSENSIUM" > .tests-to-run - echo "$TESTS_TO_RUN_R4_ESSENSIUM" > .tests-to-run
- echo "$DEVICE_UNDER_TEST_R4_ESSENSIUM" > .device-under-test - echo "$DEVICE_UNDER_TEST_R4_ESSENSIUM" > .device-under-test
rules: rules:
- if: '$TESTS_TO_RUN_R4_ESSENSIUM != "" && $DEVICE_UNDER_TEST_R4_ESSENSIUM != "prplmesh" && $DEVICE_UNDER_TEST_R4_ESSENSIUM != "urx_osp" && $DEVICE_UNDER_TEST_R4_ESSENSIUM != "urx_ospv2"' - if: '$TESTS_TO_RUN_R4_ESSENSIUM !~ /^\$/ && $DEVICE_UNDER_TEST_R4_ESSENSIUM != "prplmesh" && $DEVICE_UNDER_TEST_R4_ESSENSIUM != "urx_osp" && $DEVICE_UNDER_TEST_R4_ESSENSIUM != "urx_ospv2"'
- when: manual
allow_failure: true
timeout: 14h timeout: 14h
tags: tags:
- certs-tests-R4-essensium - certs-tests-R4-essensium