mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-09-30 05:15:33 +00:00
merge: branch 'ih/debian-polkit'
CI: fix some distros that fails to install https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2015
This commit is contained in:
commit
d899f8a1ca
|
@ -60,11 +60,11 @@ variables:
|
|||
#
|
||||
# This is done by running `ci-fairy generate-template` and possibly bumping
|
||||
# ".default_tag".
|
||||
ALPINE_TAG: 'tag-002928e49e27'
|
||||
CENTOS_TAG: 'tag-15f80c990684'
|
||||
DEBIAN_TAG: 'tag-1ce75d18715e'
|
||||
FEDORA_TAG: 'tag-15f80c990684'
|
||||
UBUNTU_TAG: 'tag-1ce75d18715e'
|
||||
ALPINE_TAG: 'tag-961e70a41177'
|
||||
CENTOS_TAG: 'tag-fe6805b2c8f4'
|
||||
DEBIAN_TAG: 'tag-f95b2e33bdf7'
|
||||
FEDORA_TAG: 'tag-fe6805b2c8f4'
|
||||
UBUNTU_TAG: 'tag-f95b2e33bdf7'
|
||||
|
||||
ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh'
|
||||
CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh'
|
||||
|
@ -294,20 +294,6 @@ tier3:debian:oldstable@prep:
|
|||
when: manual
|
||||
allow_failure: true
|
||||
|
||||
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
|
||||
rules:
|
||||
- if: $CI_PIPELINE_SOURCE != 'schedule'
|
||||
when: manual
|
||||
allow_failure: true
|
||||
|
||||
tier3:alpine:latest@prep:
|
||||
extends:
|
||||
- .fdo.container-build@alpine
|
||||
|
@ -543,20 +529,6 @@ t_debian:oldstable:
|
|||
rules:
|
||||
- if: $CI_PIPELINE_SOURCE != 'schedule'
|
||||
|
||||
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"
|
||||
rules:
|
||||
- if: $CI_PIPELINE_SOURCE != 'schedule'
|
||||
|
||||
t_alpine:latest:
|
||||
extends:
|
||||
- .build@template
|
||||
|
|
|
@ -67,10 +67,6 @@ distributions:
|
|||
versions:
|
||||
- 'stable'
|
||||
- 'oldstable'
|
||||
- name: centos
|
||||
tier: 3
|
||||
versions:
|
||||
- 'stream8'
|
||||
- name: alpine
|
||||
tier: 3
|
||||
versions:
|
||||
|
|
|
@ -71,7 +71,7 @@ install \
|
|||
meson \
|
||||
mobile-broadband-provider-info \
|
||||
pkg-config \
|
||||
policykit-1 \
|
||||
polkitd \
|
||||
ppp \
|
||||
ppp-dev \
|
||||
python3-dbus \
|
||||
|
|
Loading…
Reference in a new issue