fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 05:28:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

gitlab: merge branch 'th/fix-gitlab-for-1-32'

Browse source
This commit is contained in:
Thomas Haller 2022-01-05 08:09:53 +01:00
commit 99c0d5593d
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
4 changed files with 17 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
.gitlab-ci.yml
View file

@ -7,7 +7,7 @@
######################################## ########################################
.templates_sha: &template_sha b18e53bf67b9ed493a006d83dbadd1ecc0daa61a # see https://docs.gitlab.com/ee/ci/yaml/#includefile .templates_sha: &template_sha 14731f78c23c7b523a85a26a068ade9ac1ecd2f3 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
include: include:
# Alpine container builder template # Alpine container builder template
@ -47,11 +47,11 @@ variables:
# #
# This is done by running `ci-fairy generate-template` and possibly bump # This is done by running `ci-fairy generate-template` and possibly bump
# ".default_tag". # ".default_tag".
FEDORA_TAG: '2021-07-12.0-475202004c1a' FEDORA_TAG: '2022-01-04.0-ed7a83d49619'
UBUNTU_TAG: '2021-07-12.0-b77047ed62be' UBUNTU_TAG: '2022-01-04.0-bcc65b379852'
DEBIAN_TAG: '2021-07-12.0-b77047ed62be' DEBIAN_TAG: '2022-01-04.0-bcc65b379852'
CENTOS_TAG: '2021-07-12.0-475202004c1a' CENTOS_TAG: '2022-01-04.0-ed7a83d49619'
ALPINE_TAG: '2021-07-12.0-d7a8aea74089' ALPINE_TAG: '2022-01-04.0-3caa10046464'
FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh' FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh'
UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh' UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh'
@ -84,26 +84,6 @@ 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.
fedora:28@container-prep:
extends:
- .fdo.container-build@fedora
stage: prep
variables:
GIT_STRATEGY: none
FDO_DISTRIBUTION_VERSION: '28'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
fedora:29@container-prep:
extends:
- .fdo.container-build@fedora
stage: prep
variables:
GIT_STRATEGY: none
FDO_DISTRIBUTION_VERSION: '29'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
fedora:30@container-prep: fedora:30@container-prep:
extends: extends:
- .fdo.container-build@fedora - .fdo.container-build@fedora
@ -154,13 +134,13 @@ fedora:34@container-prep:
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
fedora:rawhide@container-prep: fedora:35@container-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: 'rawhide' FDO_DISTRIBUTION_VERSION: '35'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
@ -368,24 +348,6 @@ alpine:latest@container-prep:
only: only:
- schedules - schedules
fedora:28@container-clean:
extends:
- .container-clean
variables:
GIT_STRATEGY: none
CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
FDO_DISTRIBUTION_VERSION: '28'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
fedora:29@container-clean:
extends:
- .container-clean
variables:
GIT_STRATEGY: none
CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
FDO_DISTRIBUTION_VERSION: '29'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
fedora:30@container-clean: fedora:30@container-clean:
extends: extends:
- .container-clean - .container-clean
@ -431,13 +393,13 @@ fedora:34@container-clean:
FDO_DISTRIBUTION_VERSION: '34' FDO_DISTRIBUTION_VERSION: '34'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
fedora:rawhide@container-clean: fedora:35@container-clean:
extends: extends:
- .container-clean - .container-clean
variables: variables:
GIT_STRATEGY: none GIT_STRATEGY: none
CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
FDO_DISTRIBUTION_VERSION: 'rawhide' FDO_DISTRIBUTION_VERSION: '35'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
ubuntu:16.04@container-clean: ubuntu:16.04@container-clean:
@ -613,28 +575,6 @@ alpine:latest@container-clean:
################################################################# #################################################################
t_fedora:28:
extends:
- .build@template
- .fdo.distribution-image@fedora
variables:
FDO_DISTRIBUTION_VERSION: '28'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs:
- "fedora:28@container-prep"
when: manual
t_fedora:29:
extends:
- .build@template
- .fdo.distribution-image@fedora
variables:
FDO_DISTRIBUTION_VERSION: '29'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs:
- "fedora:29@container-prep"
when: manual
t_fedora:30: t_fedora:30:
extends: extends:
- .build@template - .build@template
@ -690,15 +630,15 @@ t_fedora:34:
needs: needs:
- "fedora:34@container-prep" - "fedora:34@container-prep"
t_fedora:rawhide: t_fedora:35:
extends: extends:
- .build@template - .build@template
- .fdo.distribution-image@fedora - .fdo.distribution-image@fedora
variables: variables:
FDO_DISTRIBUTION_VERSION: 'rawhide' FDO_DISTRIBUTION_VERSION: '35'
FDO_DISTRIBUTION_TAG: $FEDORA_TAG FDO_DISTRIBUTION_TAG: $FEDORA_TAG
needs: needs:
- "fedora:rawhide@container-prep" - "fedora:35@container-prep"
when: manual when: manual
t_ubuntu:16.04: t_ubuntu:16.04:

2
.gitlab-ci/ci.template
View file

@ -9,7 +9,7 @@
######################################## ########################################
.templates_sha: &template_sha b18e53bf67b9ed493a006d83dbadd1ecc0daa61a # see https://docs.gitlab.com/ee/ci/yaml/#includefile .templates_sha: &template_sha 14731f78c23c7b523a85a26a068ade9ac1ecd2f3 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
include: include:
{% for distro in distributions|sort(attribute="name") %} {% for distro in distributions|sort(attribute="name") %}

6
.gitlab-ci/config.yml
View file

@ -8,7 +8,7 @@
# #
# We're happy to rebuild all containers when one changes. # We're happy to rebuild all containers when one changes.
.default_tag: &default_tag '2021-07-12.0' .default_tag: &default_tag '2022-01-04.0'
# The list of all distributions we want to create job for. # The list of all distributions we want to create job for.
@ -18,14 +18,12 @@ distributions:
tag: *default_tag tag: *default_tag
base_type: fedora base_type: fedora
versions: versions:
- '28'
- '29'
- '30' - '30'
- '31' - '31'
- '32' - '32'
- '33' - '33'
- '34' - '34'
- 'rawhide' - '35'
# always: # always:
# - '33' # - '33'
- name: ubuntu - name: ubuntu

2
contrib/fedora/REQUIRED_PACKAGES
View file

@ -81,8 +81,8 @@ install \
systemd-devel \ systemd-devel \
teamd-devel \ teamd-devel \
util-linux \ util-linux \
vala \
vala-devel \ vala-devel \
vala-tools \
valgrind \ valgrind \
which \ which \
"${EXTRA_PACKAGES[@]}" "${EXTRA_PACKAGES[@]}"