From 4177f31a5b8b812cae51afe62e6f461cb11230e8 Mon Sep 17 00:00:00 2001 From: Maarten De Decker Date: Tue, 18 Nov 2025 16:31:59 +0100 Subject: [PATCH] CI: prevent nightly jobs from running in merge trains 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 --- .gitlab-ci.yml | 20 +++----------------- ci/platform.yml | 23 +++-------------------- 2 files changed, 6 insertions(+), 37 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df1fa6a14..eebf7a827 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,6 +30,9 @@ include: - if: '$CI_PIPELINE_SOURCE == "schedule"' - if: '$CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"' - 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 allow_failure: true @@ -58,18 +61,14 @@ platform: - !reference [.rules-for-expensive-job, rules] variables: STABILITY_TESTS: $STABILITY_TESTS - ALTRAN_TESTS: $ALTRAN_TESTS TESTS_TO_RUN_ESSENSIUM: $TESTS_TO_RUN_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 DEVICE_UNDER_TEST_R2_ESSENSIUM: $DEVICE_UNDER_TEST_R2_ESSENSIUM TESTS_TO_RUN_R4_ESSENSIUM: $TESTS_TO_RUN_R4_ESSENSIUM DEVICE_UNDER_TEST_R4_ESSENSIUM: $DEVICE_UNDER_TEST_R4_ESSENSIUM PARENT_PIPELINE_ID: $CI_PIPELINE_ID CI_PARENT_PIPELINE_SOURCE: $CI_PIPELINE_SOURCE - BUILD_CGR: $BUILD_CGR trigger: include: "ci/platform.yml" strategy: depend @@ -298,16 +297,3 @@ boardfarm-stability-tests: rules: - if: "$STABILITY_TESTS" 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"' diff --git a/ci/platform.yml b/ci/platform.yml index 414c2fd0c..a362d97e6 100644 --- a/ci/platform.yml +++ b/ci/platform.yml @@ -118,17 +118,6 @@ build-for-osp-ospv2: tags: - 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: extends: .test-upgrade-image variables: @@ -242,9 +231,7 @@ run-certification-tests-R1-platform-essensium: - job: build-for-turris-omnia - job: build-for-haze rules: - - if: '$TESTS_TO_RUN_ESSENSIUM != "" && $DEVICE_UNDER_TEST_ESSENSIUM != "prplmesh"' - - when: manual - allow_failure: true + - if: '$TESTS_TO_RUN_ESSENSIUM !~ /^\$/ && $DEVICE_UNDER_TEST_ESSENSIUM != "prplmesh"' run-certification-tests-R2-platform-essensium: 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 "$DEVICE_UNDER_TEST_R2_ESSENSIUM" > .device-under-test rules: - - if: '$TESTS_TO_RUN_R2_ESSENSIUM != "" && $DEVICE_UNDER_TEST_R2_ESSENSIUM != "prplmesh"' - - when: manual - allow_failure: true + - if: '$TESTS_TO_RUN_R2_ESSENSIUM !~ /^\$/ && $DEVICE_UNDER_TEST_R2_ESSENSIUM != "prplmesh"' timeout: 14h tags: - certs-tests-R2-essensium @@ -269,9 +254,7 @@ run-certification-tests-R4-platform-essensium: - echo "$TESTS_TO_RUN_R4_ESSENSIUM" > .tests-to-run - echo "$DEVICE_UNDER_TEST_R4_ESSENSIUM" > .device-under-test 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"' - - when: manual - allow_failure: true + - 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"' timeout: 14h tags: - certs-tests-R4-essensium