mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-14 20:18:39 +00:00
gitlab-ci: use Fedora 35 as default build target
This commit is contained in:
parent
615221a99c
commit
081510ed94
|
@ -47,11 +47,11 @@ variables:
|
|||
#
|
||||
# This is done by running `ci-fairy generate-template` and possibly bump
|
||||
# ".default_tag".
|
||||
FEDORA_TAG: '2021-08-30.0-7ff339b89ca1'
|
||||
UBUNTU_TAG: '2021-08-30.0-432f46c6a3a4'
|
||||
DEBIAN_TAG: '2021-08-30.0-432f46c6a3a4'
|
||||
CENTOS_TAG: '2021-08-30.0-7ff339b89ca1'
|
||||
ALPINE_TAG: '2021-08-30.0-20e22c5d34b7'
|
||||
FEDORA_TAG: '2021-11-09.0-9dd1e1db773a'
|
||||
UBUNTU_TAG: '2021-11-09.0-577176f5eb6c'
|
||||
DEBIAN_TAG: '2021-11-09.0-577176f5eb6c'
|
||||
CENTOS_TAG: '2021-11-09.0-9dd1e1db773a'
|
||||
ALPINE_TAG: '2021-11-09.0-a28badea28eb'
|
||||
|
||||
FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh'
|
||||
UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh'
|
||||
|
@ -680,23 +680,23 @@ t_fedora:34:
|
|||
extends:
|
||||
- .build@template
|
||||
- .fdo.distribution-image@fedora
|
||||
- .nm_artifacts
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: '34'
|
||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||
needs:
|
||||
- "fedora:34@container-prep"
|
||||
when: manual
|
||||
|
||||
t_fedora:35:
|
||||
extends:
|
||||
- .build@template
|
||||
- .fdo.distribution-image@fedora
|
||||
- .nm_artifacts
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: '35'
|
||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||
needs:
|
||||
- "fedora:35@container-prep"
|
||||
when: manual
|
||||
|
||||
t_fedora:36:
|
||||
extends:
|
||||
|
@ -926,7 +926,7 @@ t_alpine:latest:
|
|||
|
||||
check-patch:
|
||||
extends:
|
||||
- t_fedora:34
|
||||
- t_fedora:35
|
||||
- .nm_artifacts_undo
|
||||
stage: test
|
||||
script:
|
||||
|
@ -935,7 +935,7 @@ check-patch:
|
|||
|
||||
check-tree:
|
||||
extends:
|
||||
- t_fedora:34
|
||||
- t_fedora:35
|
||||
- .nm_artifacts_undo
|
||||
stage: test
|
||||
script:
|
||||
|
@ -955,9 +955,9 @@ pages:
|
|||
only:
|
||||
- main
|
||||
dependencies:
|
||||
- t_fedora:34
|
||||
- t_fedora:35
|
||||
needs:
|
||||
- t_fedora:34
|
||||
- t_fedora:35
|
||||
|
||||
triage:issues:
|
||||
stage: triage
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#
|
||||
|
||||
# We're happy to rebuild all containers when one changes.
|
||||
.default_tag: &default_tag '2021-08-30.0'
|
||||
.default_tag: &default_tag '2021-11-09.0'
|
||||
|
||||
|
||||
# The list of all distributions we want to create job for.
|
||||
|
@ -64,4 +64,4 @@ distributions:
|
|||
# specifies which of the above distros is used as source for pages
|
||||
pages_build:
|
||||
name: fedora
|
||||
version: '34'
|
||||
version: '35'
|
||||
|
|
|
@ -37,7 +37,7 @@ if ! podman container exists "$PODNAME" ; then
|
|||
--name="$PODNAME" \
|
||||
-v "$DIR:/tmp/NetworkManager:Z" \
|
||||
-w /tmp/NetworkManager \
|
||||
fedora:34 \
|
||||
fedora:35 \
|
||||
/bin/bash -c 'dnf upgrade -y && dnf install -y git /usr/bin/clang-format && ./contrib/scripts/nm-code-format.sh -i'
|
||||
exit 0
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue