mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-02-04 02:30:24 +01:00
ci: use Fedora 42 as tier 1 a bit more
Switching to Fedora 43 changes the formatting. As Fedora 43 is not released yet, it might still update clang-format and make it to change again, as it happened in the past with other versions of Fedora. Keep F42 until F43 is more stable.
This commit is contained in:
parent
86c7f1ed14
commit
4d17064f2a
3 changed files with 26 additions and 26 deletions
|
|
@ -60,11 +60,11 @@ variables:
|
|||
#
|
||||
# This is done by running `ci-fairy generate-template` and possibly bumping
|
||||
# ".default_tag".
|
||||
ALPINE_TAG: 'tag-f6403ec26a18'
|
||||
CENTOS_TAG: 'tag-e2b828cf6677'
|
||||
DEBIAN_TAG: 'tag-ad020ba543a8'
|
||||
FEDORA_TAG: 'tag-e2b828cf6677'
|
||||
UBUNTU_TAG: 'tag-ad020ba543a8'
|
||||
ALPINE_TAG: 'tag-722dacf5c4be'
|
||||
CENTOS_TAG: 'tag-1387a813d200'
|
||||
DEBIAN_TAG: 'tag-447ddf898453'
|
||||
FEDORA_TAG: 'tag-1387a813d200'
|
||||
UBUNTU_TAG: 'tag-447ddf898453'
|
||||
|
||||
ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh'
|
||||
CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh'
|
||||
|
|
@ -102,13 +102,13 @@ variables:
|
|||
# Build a container for each distribution + version. The ci-templates
|
||||
# will re-use the containers if the tag doesn't change.
|
||||
|
||||
tier1:fedora:43@prep:
|
||||
tier1:fedora:42@prep:
|
||||
extends:
|
||||
- .fdo.container-build@fedora
|
||||
stage: prep
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
FDO_DISTRIBUTION_VERSION: '43'
|
||||
FDO_DISTRIBUTION_VERSION: '42'
|
||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
|
||||
rules:
|
||||
|
|
@ -212,13 +212,13 @@ tier2:alpine:edge@prep:
|
|||
when: manual
|
||||
allow_failure: true
|
||||
|
||||
tier3:fedora:42@prep:
|
||||
tier3:fedora:43@prep:
|
||||
extends:
|
||||
- .fdo.container-build@fedora
|
||||
stage: prep
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
FDO_DISTRIBUTION_VERSION: '42'
|
||||
FDO_DISTRIBUTION_VERSION: '43'
|
||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
|
||||
rules:
|
||||
|
|
@ -382,7 +382,7 @@ tier3:alpine:3.19@prep:
|
|||
dependencies: []
|
||||
|
||||
|
||||
t_fedora:43:
|
||||
t_fedora:42:
|
||||
extends:
|
||||
- .build@template
|
||||
- .fdo.distribution-image@fedora
|
||||
|
|
@ -398,10 +398,10 @@ t_fedora:43:
|
|||
- tarball
|
||||
- subtree
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: '43'
|
||||
FDO_DISTRIBUTION_VERSION: '42'
|
||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||
needs:
|
||||
- "tier1:fedora:43@prep"
|
||||
- "tier1:fedora:42@prep"
|
||||
rules:
|
||||
- if: $CI_PIPELINE_SOURCE != 'schedule'
|
||||
|
||||
|
|
@ -503,17 +503,17 @@ t_alpine:edge:
|
|||
rules:
|
||||
- if: $CI_PIPELINE_SOURCE != 'schedule'
|
||||
|
||||
t_fedora:42:
|
||||
t_fedora:43:
|
||||
extends:
|
||||
- .build@template
|
||||
- .fdo.distribution-image@fedora
|
||||
- .nm_artifacts_debug
|
||||
stage: tier3
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: '42'
|
||||
FDO_DISTRIBUTION_VERSION: '43'
|
||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||
needs:
|
||||
- "tier3:fedora:42@prep"
|
||||
- "tier3:fedora:43@prep"
|
||||
rules:
|
||||
- if: $CI_PIPELINE_SOURCE != 'schedule'
|
||||
|
||||
|
|
@ -667,10 +667,10 @@ check-patch:
|
|||
extends:
|
||||
- .fdo.distribution-image@fedora
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: '43'
|
||||
FDO_DISTRIBUTION_VERSION: '42'
|
||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||
needs:
|
||||
- "tier1:fedora:43@prep"
|
||||
- "tier1:fedora:42@prep"
|
||||
rules:
|
||||
- if: $CI_PIPELINE_SOURCE != 'schedule'
|
||||
stage: tier1
|
||||
|
|
@ -682,10 +682,10 @@ check-tree:
|
|||
extends:
|
||||
- .fdo.distribution-image@fedora
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: '43'
|
||||
FDO_DISTRIBUTION_VERSION: '42'
|
||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||
needs:
|
||||
- "tier1:fedora:43@prep"
|
||||
- "tier1:fedora:42@prep"
|
||||
rules:
|
||||
- if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != $CI_DEFAULT_BRANCH
|
||||
allow_failure: true
|
||||
|
|
@ -715,9 +715,9 @@ pages:
|
|||
when: never
|
||||
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == 'main'
|
||||
dependencies:
|
||||
- "t_fedora:43: [meson+gcc+docs+valgrind]"
|
||||
- "t_fedora:42: [meson+gcc+docs+valgrind]"
|
||||
needs:
|
||||
- "t_fedora:43: [meson+gcc+docs+valgrind]"
|
||||
- "t_fedora:42: [meson+gcc+docs+valgrind]"
|
||||
|
||||
triage:issues:
|
||||
stage: triage
|
||||
|
|
@ -734,11 +734,11 @@ coverity:
|
|||
extends:
|
||||
- .fdo.distribution-image@fedora
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: '43'
|
||||
FDO_DISTRIBUTION_VERSION: '42'
|
||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||
stage: coverity
|
||||
needs:
|
||||
- "tier1:fedora:43@prep"
|
||||
- "tier1:fedora:42@prep"
|
||||
rules:
|
||||
- if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_PIPELINE_NAME == "weekly"
|
||||
script:
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ distributions:
|
|||
- name: fedora
|
||||
tier: 1
|
||||
versions:
|
||||
- '43'
|
||||
- '42'
|
||||
|
||||
# TIER 2: distribution versions that will or might use the current NM version.
|
||||
# Run when doing a release.
|
||||
|
|
@ -55,7 +55,7 @@ distributions:
|
|||
- name: fedora
|
||||
tier: 3
|
||||
versions:
|
||||
- '42'
|
||||
- '43'
|
||||
- '41'
|
||||
- name: ubuntu
|
||||
tier: 3
|
||||
|
|
|
|||
|
|
@ -11,10 +11,10 @@ fedora:
|
|||
- version: 43
|
||||
support: 2026-12-02
|
||||
nm: 1.54
|
||||
tier1-default: yes
|
||||
- version: 42
|
||||
support: 2026-05-13
|
||||
nm: 1.52
|
||||
tier1-default: yes
|
||||
- version: 41
|
||||
support: 2025-11-19
|
||||
nm: 1.50
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue