mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-25 22:20:08 +01:00
CI: fix Debian not including policykit-1 and remove EOL'd C8S
This commit is contained in:
parent
3555dbd2f2
commit
a3fabf163a
3 changed files with 7 additions and 33 deletions
|
|
@ -57,11 +57,11 @@ variables:
|
|||
#
|
||||
# This is done by running `ci-fairy generate-template` and possibly bumping
|
||||
# ".default_tag".
|
||||
ALPINE_TAG: 'tag-4e88b0485a0b'
|
||||
CENTOS_TAG: 'tag-49333ce03178'
|
||||
DEBIAN_TAG: 'tag-40fb807bf9e5'
|
||||
FEDORA_TAG: 'tag-49333ce03178'
|
||||
UBUNTU_TAG: 'tag-40fb807bf9e5'
|
||||
ALPINE_TAG: 'tag-8ef4b6bcf34c'
|
||||
CENTOS_TAG: 'tag-803911e968f4'
|
||||
DEBIAN_TAG: 'tag-c0d03ebf03d6'
|
||||
FEDORA_TAG: 'tag-803911e968f4'
|
||||
UBUNTU_TAG: 'tag-c0d03ebf03d6'
|
||||
|
||||
ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh'
|
||||
CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh'
|
||||
|
|
@ -248,17 +248,6 @@ tier3:debian:oldstable@prep:
|
|||
FDO_DISTRIBUTION_EXEC: $DEBIAN_EXEC
|
||||
when: manual
|
||||
|
||||
tier3:centos:stream8@prep:
|
||||
extends:
|
||||
- .fdo.container-build@centos
|
||||
stage: prep
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
FDO_DISTRIBUTION_VERSION: 'stream8'
|
||||
FDO_DISTRIBUTION_TAG: $CENTOS_TAG
|
||||
FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC
|
||||
when: manual
|
||||
|
||||
tier3:alpine:latest@prep:
|
||||
extends:
|
||||
- .fdo.container-build@alpine
|
||||
|
|
@ -493,18 +482,6 @@ t_debian:oldstable:
|
|||
needs:
|
||||
- "tier3:debian:oldstable@prep"
|
||||
|
||||
t_centos:stream8:
|
||||
extends:
|
||||
- .build@template
|
||||
- .fdo.distribution-image@centos
|
||||
- .nm_artifacts_debug
|
||||
stage: tier3
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: 'stream8'
|
||||
FDO_DISTRIBUTION_TAG: $CENTOS_TAG
|
||||
needs:
|
||||
- "tier3:centos:stream8@prep"
|
||||
|
||||
t_alpine:latest:
|
||||
extends:
|
||||
- .build@template
|
||||
|
|
|
|||
|
|
@ -64,10 +64,6 @@ distributions:
|
|||
versions:
|
||||
- 'stable'
|
||||
- 'oldstable'
|
||||
- name: centos
|
||||
tier: 3
|
||||
versions:
|
||||
- 'stream8'
|
||||
- name: alpine
|
||||
tier: 3
|
||||
versions:
|
||||
|
|
|
|||
|
|
@ -71,7 +71,6 @@ install \
|
|||
meson \
|
||||
mobile-broadband-provider-info \
|
||||
pkg-config \
|
||||
policykit-1 \
|
||||
ppp \
|
||||
ppp-dev \
|
||||
python3-dbus \
|
||||
|
|
@ -87,6 +86,8 @@ install \
|
|||
|
||||
install_ignore_missing \
|
||||
python-setuptools \
|
||||
polkitd \
|
||||
policykit-1 \
|
||||
\
|
||||
#end
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue