colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: use default_distro for coverity job

Browse Source 
Previously, the coverity scheduled job seemed to fail
randomly because the image that it expected to use was
not available, due to not depending on the "prep" job.

This commit resolves the problem by making sure
the image is always built when coverity runs.
This commit is contained in:
Jan Vaclav
2025-01-13 12:36:15 +01:00
parent 7633b5e493
commit 9ed9037465
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
.gitlab-ci.yml
View File

@@ -60,11 +60,11 @@ variables:
# #
# This is done by running `ci-fairy generate-template` and possibly bumping # This is done by running `ci-fairy generate-template` and possibly bumping
# ".default_tag". # ".default_tag".
ALPINE_TAG: 'tag-490e97b0b9c7' ALPINE_TAG: 'tag-28624746b6b1'
CENTOS_TAG: 'tag-4a2c52092329' CENTOS_TAG: 'tag-ca7bb4b2cd94'
DEBIAN_TAG: 'tag-aef8f2fd2198' DEBIAN_TAG: 'tag-37f5e32f6021'
FEDORA_TAG: 'tag-4a2c52092329' FEDORA_TAG: 'tag-ca7bb4b2cd94'
UBUNTU_TAG: 'tag-aef8f2fd2198' UBUNTU_TAG: 'tag-37f5e32f6021'
ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh' ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh'
CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh' CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh'
@@ -112,7 +112,7 @@ tier1:fedora:41@prep:
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
rules: rules:
- if: $CI_PIPELINE_SOURCE != 'schedule' - if: $CI_PIPELINE_SOURCE != 'schedule' || $SCHEDULED_PIPELINE_NAME == "weekly"
tier2:fedora:rawhide@prep: tier2:fedora:rawhide@prep:
extends: extends:
@@ -674,10 +674,11 @@ coverity:
extends: extends:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
variables: variables:
FDO_DISTRIBUTION_VERSION: '40' FDO_DISTRIBUTION_VERSION: '41'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
stage: coverity stage: coverity
needs: [] needs:
- "tier1:fedora:41@prep"
rules: rules:
- if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_PIPELINE_NAME == "weekly" - if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_PIPELINE_NAME == "weekly"
script: script:

13
.gitlab-ci/ci.template
View File

@@ -119,8 +119,10 @@ tier{{distro.tier}}:{{distro.name}}:{{version}}@prep:
FDO_DISTRIBUTION_TAG: ${{distro.name.upper()}}_TAG FDO_DISTRIBUTION_TAG: ${{distro.name.upper()}}_TAG
FDO_DISTRIBUTION_EXEC: ${{distro.name.upper()}}_EXEC FDO_DISTRIBUTION_EXEC: ${{distro.name.upper()}}_EXEC
rules: rules:
{% if distro.tier == 1 %}
- if: $CI_PIPELINE_SOURCE != 'schedule' || $SCHEDULED_PIPELINE_NAME == "weekly"
{% else %}
- if: $CI_PIPELINE_SOURCE != 'schedule' - if: $CI_PIPELINE_SOURCE != 'schedule'
{% if distro.tier > 1 %}
when: manual when: manual
allow_failure: true allow_failure: true
{% endif %} {% endif %}
@@ -253,12 +255,13 @@ triage:issues:
coverity: coverity:
extends: extends:
- .fdo.distribution-image@fedora - .fdo.distribution-image@{{default_distro.name}}
variables: variables:
FDO_DISTRIBUTION_VERSION: '40' FDO_DISTRIBUTION_VERSION: '{{default_distro.versions[0]}}'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: ${{default_distro.name.upper()}}_TAG
stage: coverity stage: coverity
needs: [] needs:
- "tier{{default_distro.tier}}:{{default_distro.name}}:{{default_distro.versions[0]}}@prep"
rules: rules:
- if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_PIPELINE_NAME == "weekly" - if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_PIPELINE_NAME == "weekly"
script: script: