From 593b4e01a4c69b45bcb89cb952e14a4fb3f54f29 Mon Sep 17 00:00:00 2001 From: Jan Vaclav Date: Thu, 27 Jun 2024 13:23:15 +0200 Subject: [PATCH] gitlab-ci: ensure coverity job runs weekly Currently, the condition is not strict enough, and so the job runs every time a scheduled task is triggered - which is currently daily. https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1979 --- .gitlab-ci.yml | 12 ++++++------ .gitlab-ci/ci.template | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8a80e0239..ef20bb04a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,11 +60,11 @@ variables: # # This is done by running `ci-fairy generate-template` and possibly bumping # ".default_tag". - ALPINE_TAG: 'tag-f0b648c04526' - CENTOS_TAG: 'tag-c2d500e0391f' - DEBIAN_TAG: 'tag-7687baa06688' - FEDORA_TAG: 'tag-c2d500e0391f' - UBUNTU_TAG: 'tag-7687baa06688' + ALPINE_TAG: 'tag-21203a6f1da4' + CENTOS_TAG: 'tag-15f80c990684' + DEBIAN_TAG: 'tag-1ce75d18715e' + FEDORA_TAG: 'tag-15f80c990684' + UBUNTU_TAG: 'tag-1ce75d18715e' ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh' CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh' @@ -649,7 +649,7 @@ coverity: stage: coverity needs: [] rules: - - if: $CI_PIPELINE_SOURCE == 'schedule' + - if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_PIPELINE_NAME == "weekly" script: - dnf install -y curl - BUILD_TYPE=meson CC=gcc CONFIGURE_ONLY=1 contrib/scripts/nm-ci-run.sh diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index aa9cfb968..208c34903 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -258,7 +258,7 @@ coverity: stage: coverity needs: [] rules: - - if: $CI_PIPELINE_SOURCE == 'schedule' + - if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_PIPELINE_NAME == "weekly" script: - dnf install -y curl - BUILD_TYPE=meson CC=gcc CONFIGURE_ONLY=1 contrib/scripts/nm-ci-run.sh