gitlab-ci: update default Fedora image for building pages and check steps
We want to follow current Fedora, so update to Fedora 38. Also, we now use clang-format from Fedora 38 release, so the default image in gitlab-ci must match, because that image is used for the "check-tree" test. While at it, add Fedora 39 and move Fedora 36 to tier 3.
This commit is contained in:
123
.gitlab-ci.yml
123
.gitlab-ci.yml
@@ -56,11 +56,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-a093d6371bfe'
|
ALPINE_TAG: 'tag-8399f83819ed'
|
||||||
CENTOS_TAG: 'tag-b353b5cc34d6'
|
CENTOS_TAG: 'tag-a5e8e3d94c70'
|
||||||
DEBIAN_TAG: 'tag-2d5f18a2ec1a'
|
DEBIAN_TAG: 'tag-f97319c5ab59'
|
||||||
FEDORA_TAG: 'tag-b353b5cc34d6'
|
FEDORA_TAG: 'tag-a5e8e3d94c70'
|
||||||
UBUNTU_TAG: 'tag-2d5f18a2ec1a'
|
UBUNTU_TAG: 'tag-f97319c5ab59'
|
||||||
|
|
||||||
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'
|
||||||
@@ -96,7 +96,17 @@ 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:37@prep:
|
tier1:fedora:38@prep:
|
||||||
|
extends:
|
||||||
|
- .fdo.container-build@fedora
|
||||||
|
stage: prep
|
||||||
|
variables:
|
||||||
|
GIT_STRATEGY: none
|
||||||
|
FDO_DISTRIBUTION_VERSION: '38'
|
||||||
|
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||||
|
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
|
||||||
|
|
||||||
|
tier2:fedora:37@prep:
|
||||||
extends:
|
extends:
|
||||||
- .fdo.container-build@fedora
|
- .fdo.container-build@fedora
|
||||||
stage: prep
|
stage: prep
|
||||||
@@ -105,25 +115,15 @@ tier1:fedora:37@prep:
|
|||||||
FDO_DISTRIBUTION_VERSION: '37'
|
FDO_DISTRIBUTION_VERSION: '37'
|
||||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||||
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
|
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
|
||||||
|
|
||||||
tier2:fedora:36@prep:
|
|
||||||
extends:
|
|
||||||
- .fdo.container-build@fedora
|
|
||||||
stage: prep
|
|
||||||
variables:
|
|
||||||
GIT_STRATEGY: none
|
|
||||||
FDO_DISTRIBUTION_VERSION: '36'
|
|
||||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
|
||||||
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
|
|
||||||
when: manual
|
when: manual
|
||||||
|
|
||||||
tier2:fedora:38@prep:
|
tier2:fedora:39@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: '38'
|
FDO_DISTRIBUTION_VERSION: '39'
|
||||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||||
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
|
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
|
||||||
when: manual
|
when: manual
|
||||||
@@ -194,6 +194,17 @@ tier3:fedora:35@prep:
|
|||||||
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
|
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
|
||||||
when: manual
|
when: manual
|
||||||
|
|
||||||
|
tier3:fedora:36@prep:
|
||||||
|
extends:
|
||||||
|
- .fdo.container-build@fedora
|
||||||
|
stage: prep
|
||||||
|
variables:
|
||||||
|
GIT_STRATEGY: none
|
||||||
|
FDO_DISTRIBUTION_VERSION: '36'
|
||||||
|
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||||
|
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
|
||||||
|
when: manual
|
||||||
|
|
||||||
tier2:ubuntu:18.04@prep:
|
tier2:ubuntu:18.04@prep:
|
||||||
extends:
|
extends:
|
||||||
- .fdo.container-build@ubuntu
|
- .fdo.container-build@ubuntu
|
||||||
@@ -419,7 +430,7 @@ tier2:alpine:latest@prep:
|
|||||||
dependencies: []
|
dependencies: []
|
||||||
|
|
||||||
|
|
||||||
t_fedora:37:
|
t_fedora:38:
|
||||||
extends:
|
extends:
|
||||||
- .build@template
|
- .build@template
|
||||||
- .fdo.distribution-image@fedora
|
- .fdo.distribution-image@fedora
|
||||||
@@ -436,35 +447,35 @@ t_fedora:37:
|
|||||||
- rpm+meson
|
- rpm+meson
|
||||||
- tarball
|
- tarball
|
||||||
- subtree
|
- subtree
|
||||||
variables:
|
|
||||||
FDO_DISTRIBUTION_VERSION: '37'
|
|
||||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
|
||||||
needs:
|
|
||||||
- "tier1:fedora:37@prep"
|
|
||||||
|
|
||||||
t_fedora:36:
|
|
||||||
extends:
|
|
||||||
- .build@template
|
|
||||||
- .fdo.distribution-image@fedora
|
|
||||||
- .nm_artifacts_debug
|
|
||||||
stage: tier2
|
|
||||||
variables:
|
|
||||||
FDO_DISTRIBUTION_VERSION: '36'
|
|
||||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
|
||||||
needs:
|
|
||||||
- "tier2:fedora:36@prep"
|
|
||||||
|
|
||||||
t_fedora:38:
|
|
||||||
extends:
|
|
||||||
- .build@template
|
|
||||||
- .fdo.distribution-image@fedora
|
|
||||||
- .nm_artifacts_debug
|
|
||||||
stage: tier2
|
|
||||||
variables:
|
variables:
|
||||||
FDO_DISTRIBUTION_VERSION: '38'
|
FDO_DISTRIBUTION_VERSION: '38'
|
||||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||||
needs:
|
needs:
|
||||||
- "tier2:fedora:38@prep"
|
- "tier1:fedora:38@prep"
|
||||||
|
|
||||||
|
t_fedora:37:
|
||||||
|
extends:
|
||||||
|
- .build@template
|
||||||
|
- .fdo.distribution-image@fedora
|
||||||
|
- .nm_artifacts_debug
|
||||||
|
stage: tier2
|
||||||
|
variables:
|
||||||
|
FDO_DISTRIBUTION_VERSION: '37'
|
||||||
|
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||||
|
needs:
|
||||||
|
- "tier2:fedora:37@prep"
|
||||||
|
|
||||||
|
t_fedora:39:
|
||||||
|
extends:
|
||||||
|
- .build@template
|
||||||
|
- .fdo.distribution-image@fedora
|
||||||
|
- .nm_artifacts_debug
|
||||||
|
stage: tier2
|
||||||
|
variables:
|
||||||
|
FDO_DISTRIBUTION_VERSION: '39'
|
||||||
|
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||||
|
needs:
|
||||||
|
- "tier2:fedora:39@prep"
|
||||||
|
|
||||||
t_fedora:30:
|
t_fedora:30:
|
||||||
extends:
|
extends:
|
||||||
@@ -538,6 +549,18 @@ t_fedora:35:
|
|||||||
needs:
|
needs:
|
||||||
- "tier3:fedora:35@prep"
|
- "tier3:fedora:35@prep"
|
||||||
|
|
||||||
|
t_fedora:36:
|
||||||
|
extends:
|
||||||
|
- .build@template
|
||||||
|
- .fdo.distribution-image@fedora
|
||||||
|
- .nm_artifacts_debug
|
||||||
|
stage: tier3
|
||||||
|
variables:
|
||||||
|
FDO_DISTRIBUTION_VERSION: '36'
|
||||||
|
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||||
|
needs:
|
||||||
|
- "tier3:fedora:36@prep"
|
||||||
|
|
||||||
t_ubuntu:18.04:
|
t_ubuntu:18.04:
|
||||||
extends:
|
extends:
|
||||||
- .build@template
|
- .build@template
|
||||||
@@ -776,10 +799,10 @@ check-patch:
|
|||||||
extends:
|
extends:
|
||||||
- .fdo.distribution-image@fedora
|
- .fdo.distribution-image@fedora
|
||||||
variables:
|
variables:
|
||||||
FDO_DISTRIBUTION_VERSION: '37'
|
FDO_DISTRIBUTION_VERSION: '38'
|
||||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||||
needs:
|
needs:
|
||||||
- "tier1:fedora:37@prep"
|
- "tier1:fedora:38@prep"
|
||||||
stage: tier1
|
stage: tier1
|
||||||
script:
|
script:
|
||||||
- date '+%Y%m%d-%H%M%S'; NM_CHECKPATCH_FETCH_UPSTREAM=1 contrib/scripts/checkpatch-feature-branch.sh
|
- date '+%Y%m%d-%H%M%S'; NM_CHECKPATCH_FETCH_UPSTREAM=1 contrib/scripts/checkpatch-feature-branch.sh
|
||||||
@@ -789,10 +812,10 @@ check-tree:
|
|||||||
extends:
|
extends:
|
||||||
- .fdo.distribution-image@fedora
|
- .fdo.distribution-image@fedora
|
||||||
variables:
|
variables:
|
||||||
FDO_DISTRIBUTION_VERSION: '37'
|
FDO_DISTRIBUTION_VERSION: '38'
|
||||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||||
needs:
|
needs:
|
||||||
- "tier1:fedora:37@prep"
|
- "tier1:fedora:38@prep"
|
||||||
stage: tier1
|
stage: tier1
|
||||||
script:
|
script:
|
||||||
- date '+%Y%m%d-%H%M%S'; contrib/scripts/nm-python-black-format.sh --check
|
- date '+%Y%m%d-%H%M%S'; contrib/scripts/nm-python-black-format.sh --check
|
||||||
@@ -811,9 +834,9 @@ pages:
|
|||||||
only:
|
only:
|
||||||
- main
|
- main
|
||||||
dependencies:
|
dependencies:
|
||||||
- "t_fedora:37: [autotools+gcc+docs+valgrind]"
|
- "t_fedora:38: [autotools+gcc+docs+valgrind]"
|
||||||
needs:
|
needs:
|
||||||
- "t_fedora:37: [autotools+gcc+docs+valgrind]"
|
- "t_fedora:38: [autotools+gcc+docs+valgrind]"
|
||||||
|
|
||||||
triage:issues:
|
triage:issues:
|
||||||
stage: triage
|
stage: triage
|
||||||
|
@@ -22,12 +22,12 @@ distributions:
|
|||||||
# The first tier:1 in the list is used to build the pages and check-{tree,patch}
|
# The first tier:1 in the list is used to build the pages and check-{tree,patch}
|
||||||
tier: 1
|
tier: 1
|
||||||
versions:
|
versions:
|
||||||
- '37'
|
- '38'
|
||||||
- name: fedora
|
- name: fedora
|
||||||
tier: 2
|
tier: 2
|
||||||
versions:
|
versions:
|
||||||
- '36'
|
- '37'
|
||||||
- '38'
|
- '39'
|
||||||
- name: fedora
|
- name: fedora
|
||||||
tier: 3
|
tier: 3
|
||||||
versions:
|
versions:
|
||||||
@@ -37,6 +37,7 @@ distributions:
|
|||||||
- '33'
|
- '33'
|
||||||
- '34'
|
- '34'
|
||||||
- '35'
|
- '35'
|
||||||
|
- '36'
|
||||||
- name: ubuntu
|
- name: ubuntu
|
||||||
tier: 2
|
tier: 2
|
||||||
versions:
|
versions:
|
||||||
|
Reference in New Issue
Block a user