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

ci: update supported distros

Browse Source
This commit is contained in:
Íñigo Huguet
2025-05-02 16:04:40 +02:00
parent 26d4bc9d32
commit 3d1b55047b
3 changed files with 62 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
.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-57edf560bf4f' ALPINE_TAG: 'tag-da1ae96102c6'
CENTOS_TAG: 'tag-7ea4f50c8578' CENTOS_TAG: 'tag-c8df7d2b249f'
DEBIAN_TAG: 'tag-1601ce2572c5' DEBIAN_TAG: 'tag-e68f538711ec'
FEDORA_TAG: 'tag-7ea4f50c8578' FEDORA_TAG: 'tag-c8df7d2b249f'
UBUNTU_TAG: 'tag-1601ce2572c5' UBUNTU_TAG: 'tag-e68f538711ec'
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'
@@ -102,13 +102,13 @@ variables:
# Build a container for each distribution + version. The ci-templates # Build a container for each distribution + version. The ci-templates
# will re-use the containers if the tag doesn't change. # will re-use the containers if the tag doesn't change.
tier1:fedora:41@prep: tier1:fedora:42@prep:
extends: extends:
- .fdo.container-build@fedora - .fdo.container-build@fedora
stage: prep stage: prep
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
FDO_DISTRIBUTION_VERSION: '41' FDO_DISTRIBUTION_VERSION: '42'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
rules: rules:
@@ -198,13 +198,13 @@ tier2:alpine:edge@prep:
when: manual when: manual
allow_failure: true allow_failure: true
tier3:fedora:40@prep: tier3:fedora:41@prep:
extends: extends:
- .fdo.container-build@fedora - .fdo.container-build@fedora
stage: prep stage: prep
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
FDO_DISTRIBUTION_VERSION: '40' FDO_DISTRIBUTION_VERSION: '41'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
rules: rules:
@@ -212,6 +212,20 @@ tier3:fedora:40@prep:
when: manual when: manual
allow_failure: true allow_failure: true
tier3:ubuntu:25.04@prep:
extends:
- .fdo.container-build@ubuntu
stage: prep
variables:
GIT_STRATEGY: none
FDO_DISTRIBUTION_VERSION: '25.04'
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
FDO_DISTRIBUTION_EXEC: $UBUNTU_EXEC
rules:
- if: $CI_PIPELINE_SOURCE != 'schedule'
when: manual
allow_failure: true
tier3:ubuntu:24.10@prep: tier3:ubuntu:24.10@prep:
extends: extends:
- .fdo.container-build@ubuntu - .fdo.container-build@ubuntu
@@ -254,20 +268,6 @@ tier3:ubuntu:22.04@prep:
when: manual when: manual
allow_failure: true allow_failure: true
tier3:ubuntu:20.04@prep:
extends:
- .fdo.container-build@ubuntu
stage: prep
variables:
GIT_STRATEGY: none
FDO_DISTRIBUTION_VERSION: '20.04'
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
FDO_DISTRIBUTION_EXEC: $UBUNTU_EXEC
rules:
- if: $CI_PIPELINE_SOURCE != 'schedule'
when: manual
allow_failure: true
tier3:debian:12@prep: tier3:debian:12@prep:
extends: extends:
- .fdo.container-build@debian - .fdo.container-build@debian
@@ -324,20 +324,6 @@ tier3:alpine:3.19@prep:
when: manual when: manual
allow_failure: true allow_failure: true
tier3:alpine:3.18@prep:
extends:
- .fdo.container-build@alpine
stage: prep
variables:
GIT_STRATEGY: none
FDO_DISTRIBUTION_VERSION: '3.18'
FDO_DISTRIBUTION_TAG: $ALPINE_TAG
FDO_DISTRIBUTION_EXEC: $ALPINE_EXEC
rules:
- if: $CI_PIPELINE_SOURCE != 'schedule'
when: manual
allow_failure: true
################################################################# #################################################################
# # # #
# tierN stage # # tierN stage #
@@ -354,7 +340,7 @@ tier3:alpine:3.18@prep:
dependencies: [] dependencies: []
t_fedora:41: t_fedora:42:
extends: extends:
- .build@template - .build@template
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
@@ -370,10 +356,10 @@ t_fedora:41:
- tarball - tarball
- subtree - subtree
variables: variables:
FDO_DISTRIBUTION_VERSION: '41' FDO_DISTRIBUTION_VERSION: '42'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs: needs:
- "tier1:fedora:41@prep" - "tier1:fedora:42@prep"
rules: rules:
- if: $CI_PIPELINE_SOURCE != 'schedule' - if: $CI_PIPELINE_SOURCE != 'schedule'
@@ -461,17 +447,31 @@ t_alpine:edge:
rules: rules:
- if: $CI_PIPELINE_SOURCE != 'schedule' - if: $CI_PIPELINE_SOURCE != 'schedule'
t_fedora:40: t_fedora:41:
extends: extends:
- .build@template - .build@template
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
- .nm_artifacts_debug - .nm_artifacts_debug
stage: tier3 stage: tier3
variables: variables:
FDO_DISTRIBUTION_VERSION: '40' FDO_DISTRIBUTION_VERSION: '41'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs: needs:
- "tier3:fedora:40@prep" - "tier3:fedora:41@prep"
rules:
- if: $CI_PIPELINE_SOURCE != 'schedule'
t_ubuntu:25.04:
extends:
- .build@template
- .fdo.distribution-image@ubuntu
- .nm_artifacts_debug
stage: tier3
variables:
FDO_DISTRIBUTION_VERSION: '25.04'
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
needs:
- "tier3:ubuntu:25.04@prep"
rules: rules:
- if: $CI_PIPELINE_SOURCE != 'schedule' - if: $CI_PIPELINE_SOURCE != 'schedule'
@@ -517,20 +517,6 @@ t_ubuntu:22.04:
rules: rules:
- if: $CI_PIPELINE_SOURCE != 'schedule' - if: $CI_PIPELINE_SOURCE != 'schedule'
t_ubuntu:20.04:
extends:
- .build@template
- .fdo.distribution-image@ubuntu
- .nm_artifacts_debug
stage: tier3
variables:
FDO_DISTRIBUTION_VERSION: '20.04'
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
needs:
- "tier3:ubuntu:20.04@prep"
rules:
- if: $CI_PIPELINE_SOURCE != 'schedule'
t_debian:12: t_debian:12:
extends: extends:
- .build@template - .build@template
@@ -587,20 +573,6 @@ t_alpine:3.19:
rules: rules:
- if: $CI_PIPELINE_SOURCE != 'schedule' - if: $CI_PIPELINE_SOURCE != 'schedule'
t_alpine:3.18:
extends:
- .build@template
- .fdo.distribution-image@alpine
- .nm_artifacts_debug
stage: tier3
variables:
FDO_DISTRIBUTION_VERSION: '3.18'
FDO_DISTRIBUTION_TAG: $ALPINE_TAG
needs:
- "tier3:alpine:3.18@prep"
rules:
- if: $CI_PIPELINE_SOURCE != 'schedule'
################################################################# #################################################################
# # # #
# specific jobs # # specific jobs #
@@ -611,10 +583,10 @@ check-patch:
extends: extends:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
variables: variables:
FDO_DISTRIBUTION_VERSION: '41' FDO_DISTRIBUTION_VERSION: '42'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs: needs:
- "tier1:fedora:41@prep" - "tier1:fedora:42@prep"
rules: rules:
- if: $CI_PIPELINE_SOURCE != 'schedule' - if: $CI_PIPELINE_SOURCE != 'schedule'
stage: tier1 stage: tier1
@@ -626,10 +598,10 @@ check-tree:
extends: extends:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
variables: variables:
FDO_DISTRIBUTION_VERSION: '41' FDO_DISTRIBUTION_VERSION: '42'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs: needs:
- "tier1:fedora:41@prep" - "tier1:fedora:42@prep"
rules: rules:
- if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != $CI_DEFAULT_BRANCH - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != $CI_DEFAULT_BRANCH
allow_failure: true allow_failure: true
@@ -659,9 +631,9 @@ pages:
when: never when: never
- if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == 'main' - if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == 'main'
dependencies: dependencies:
- "t_fedora:41: [meson+gcc+docs+valgrind]" - "t_fedora:42: [meson+gcc+docs+valgrind]"
needs: needs:
- "t_fedora:41: [meson+gcc+docs+valgrind]" - "t_fedora:42: [meson+gcc+docs+valgrind]"
triage:issues: triage:issues:
stage: triage stage: triage
@@ -678,11 +650,11 @@ coverity:
extends: extends:
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
variables: variables:
FDO_DISTRIBUTION_VERSION: '41' FDO_DISTRIBUTION_VERSION: '42'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
stage: coverity stage: coverity
needs: needs:
- "tier1:fedora:41@prep" - "tier1:fedora:42@prep"
rules: rules:
- if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_PIPELINE_NAME == "weekly" - if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_PIPELINE_NAME == "weekly"
script: script:

7
.gitlab-ci/config.yml
View File

@@ -23,7 +23,7 @@ distributions:
- name: fedora - name: fedora
tier: 1 tier: 1
versions: versions:
- '41' - '42'
# TIER 2: distribution versions that will or might use the current NM version. # TIER 2: distribution versions that will or might use the current NM version.
# Run when doing a release. # Run when doing a release.
@@ -54,14 +54,14 @@ distributions:
- name: fedora - name: fedora
tier: 3 tier: 3
versions: versions:
- '40' - '41'
- name: ubuntu - name: ubuntu
tier: 3 tier: 3
versions: versions:
- '25.04'
- '24.10' - '24.10'
- '24.04' - '24.04'
- '22.04' - '22.04'
- '20.04'
- name: debian - name: debian
tier: 3 tier: 3
versions: versions:
@@ -72,4 +72,3 @@ distributions:
- '3.21' - '3.21'
- '3.20' - '3.20'
- '3.19' - '3.19'
- '3.18'

20
.gitlab-ci/distros-info.yml
View File

@@ -8,13 +8,13 @@ fedora:
- version: rawhide - version: rawhide
support: yes support: yes
nm: main nm: main
- version: 42
support: 2026-05-13
nm: 1.52
tier1-default: yes
- version: 41 - version: 41
support: 2025-11-19 support: 2025-11-19
nm: 1.50 nm: 1.50
tier1-default: yes
- version: 40
support: 2025-05-13
nm: 1.46
# CentOS Stream # CentOS Stream
centos: centos:
@@ -77,6 +77,10 @@ ubuntu:
- version: devel - version: devel
support: yes support: yes
nm: main nm: main
- version: 25.04
name: plucky
support: 2026-01-15
nm: 1.52
- version: 24.10 - version: 24.10
name: oracular name: oracular
support: 2025-07-10 support: 2025-07-10
@@ -91,11 +95,6 @@ ubuntu:
support: 2027-06-01 support: 2027-06-01
extended-support: 2032-04-21 extended-support: 2032-04-21
nm: 1.36 nm: 1.36
- version: 20.04
name: focal
support: 2025-05-29
extended-support: 2030-04-23
nm: 1.22
# Debian: # Debian:
# cadence: every 2 years # cadence: every 2 years
@@ -140,6 +139,3 @@ alpine:
- version: 3.19 - version: 3.19
support: 2025-11-01 support: 2025-11-01
nm: 1.44 nm: 1.44
- version: 3.18
support: 2025-05-09
nm: 1.42