Filtering jobs using the selected jobs regex is missing for qemu-export + yocto jobs when running regular pipelines and eclair jobs when running scheduled pipelines.
First, set a default value for the selected jobs regex to remove the need to always check if the variable is empty. Then add the missing rules to filter out those jobs. Signed-off-by: Victor Lira <[email protected]> --- changes v2: - rebase onto staging with SELECTED_JOBS_ONLY="/alpine-3.18-gcc$/" ... before push: https://gitlab.com/xen-project/people/victormlira/xen/-/pipelines/2212050840 after push: https://gitlab.com/xen-project/people/victormlira/xen/-/pipelines/2212063969 before schedule: https://gitlab.com/xen-project/people/victormlira/xen/-/pipelines/2212068543 after schedule: https://gitlab.com/xen-project/people/victormlira/xen/-/pipelines/2212066703 Cc: Nicola Vetrini <[email protected]> Cc: Doug Goldstein <[email protected]> Cc: Stefano Stabellini <[email protected]> --- .gitlab-ci.yml | 1 + automation/gitlab-ci/analyze.yaml | 5 +++-- automation/gitlab-ci/build.yaml | 9 ++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7974ac4e82..64bed300a6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,7 @@ variables: XEN_REGISTRY: registry.gitlab.com/xen-project/xen SELECTED_JOBS_ONLY: description: "Regex to select only some jobs, must be enclosed with /. For example /job1|job2/" + value: "/.*/" workflow: name: "$CI_PIPELINE_SCHEDULE_DESCRIPTION" diff --git a/automation/gitlab-ci/analyze.yaml b/automation/gitlab-ci/analyze.yaml index e9a8f9d544..a472692fcb 100644 --- a/automation/gitlab-ci/analyze.yaml +++ b/automation/gitlab-ci/analyze.yaml @@ -31,8 +31,7 @@ rules: - if: $CI_PIPELINE_SOURCE == "schedule" when: never - - if: $SELECTED_JOBS_ONLY && $CI_JOB_NAME =~ $SELECTED_JOBS_ONLY - - if: $SELECTED_JOBS_ONLY + - if: $CI_JOB_NAME !~ $SELECTED_JOBS_ONLY when: never - if: $WTOKEN && $CI_PROJECT_PATH =~ /^xen-project\/people\/.*$/ when: manual @@ -172,6 +171,8 @@ eclair-ARM64-amd: rules: - if: $CI_PIPELINE_SOURCE != "schedule" when: never + - if: $CI_JOB_NAME !~ $SELECTED_JOBS_ONLY + when: never - !reference [.eclair-analysis, rules] eclair-x86_64-allrules:on-schedule: diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 4cb52fe597..e9e04e37d4 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -226,6 +226,9 @@ - binaries/ when: always needs: [] + rules: + - if: $CI_JOB_NAME =~ $SELECTED_JOBS_ONLY + when: manual .yocto-test-arm64: extends: .yocto-test @@ -261,6 +264,9 @@ .test-jobs-artifact-common: stage: build needs: [] + rules: + - if: $CI_JOB_NAME =~ $SELECTED_JOBS_ONLY + when: on_success # Arm test artifacts @@ -468,20 +474,17 @@ yocto-qemuarm64: extends: .yocto-test-arm64 variables: YOCTO_BOARD: qemuarm64 - when: manual yocto-qemuarm: extends: .yocto-test-arm64 variables: YOCTO_BOARD: qemuarm YOCTO_OUTPUT: --copy-output - when: manual yocto-qemux86-64: extends: .yocto-test-x86-64 variables: YOCTO_BOARD: qemux86-64 - when: manual # Cppcheck analysis jobs -- 2.51.GIT
