mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-09 20:30:20 +01:00
gitlab,python: merge branch 'th/gitlab-ci-no-el7'
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1782
This commit is contained in:
Thomas Haller
commit
2d2f9e0be4
5 changed files with 30 additions and 139 deletions
148
.gitlab-ci.yml
148
.gitlab-ci.yml
|
|
@ -57,11 +57,11 @@ variables:
|
|||
#
|
||||
# This is done by running `ci-fairy generate-template` and possibly bumping
|
||||
# ".default_tag".
|
||||
ALPINE_TAG: 'tag-d53edbf2ebdd'
|
||||
CENTOS_TAG: 'tag-c374af7add25'
|
||||
DEBIAN_TAG: 'tag-0e28ea47158f'
|
||||
FEDORA_TAG: 'tag-c374af7add25'
|
||||
UBUNTU_TAG: 'tag-0e28ea47158f'
|
||||
ALPINE_TAG: 'tag-15ad9771f66e'
|
||||
CENTOS_TAG: 'tag-01eb3016c31d'
|
||||
DEBIAN_TAG: 'tag-5b69abc7e7b7'
|
||||
FEDORA_TAG: 'tag-01eb3016c31d'
|
||||
UBUNTU_TAG: 'tag-5b69abc7e7b7'
|
||||
|
||||
ALPINE_EXEC: 'bash .gitlab-ci/alpine-install.sh'
|
||||
CENTOS_EXEC: 'bash .gitlab-ci/fedora-install.sh'
|
||||
|
|
@ -129,6 +129,17 @@ tier2:fedora:39@prep:
|
|||
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
|
||||
when: manual
|
||||
|
||||
tier2:fedora:40@prep:
|
||||
extends:
|
||||
- .fdo.container-build@fedora
|
||||
stage: prep
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
FDO_DISTRIBUTION_VERSION: '40'
|
||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
|
||||
when: manual
|
||||
|
||||
tier3:fedora:30@prep:
|
||||
extends:
|
||||
- .fdo.container-build@fedora
|
||||
|
|
@ -316,28 +327,6 @@ tier3:debian:testing@prep:
|
|||
FDO_DISTRIBUTION_EXEC: $DEBIAN_EXEC
|
||||
when: manual
|
||||
|
||||
tier2:centos:7.5.1804@prep:
|
||||
extends:
|
||||
- .fdo.container-build@centos
|
||||
stage: prep
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
FDO_DISTRIBUTION_VERSION: '7.5.1804'
|
||||
FDO_DISTRIBUTION_TAG: $CENTOS_TAG
|
||||
FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC
|
||||
when: manual
|
||||
|
||||
tier2:centos:7.9.2009@prep:
|
||||
extends:
|
||||
- .fdo.container-build@centos
|
||||
stage: prep
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
FDO_DISTRIBUTION_VERSION: '7.9.2009'
|
||||
FDO_DISTRIBUTION_TAG: $CENTOS_TAG
|
||||
FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC
|
||||
when: manual
|
||||
|
||||
tier2:centos:8.1.1911@prep:
|
||||
extends:
|
||||
- .fdo.container-build@centos
|
||||
|
|
@ -382,39 +371,6 @@ tier2:centos:stream9@prep:
|
|||
FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC
|
||||
when: manual
|
||||
|
||||
tier3:centos:7.6.1810@prep:
|
||||
extends:
|
||||
- .fdo.container-build@centos
|
||||
stage: prep
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
FDO_DISTRIBUTION_VERSION: '7.6.1810'
|
||||
FDO_DISTRIBUTION_TAG: $CENTOS_TAG
|
||||
FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC
|
||||
when: manual
|
||||
|
||||
tier3:centos:7.7.1908@prep:
|
||||
extends:
|
||||
- .fdo.container-build@centos
|
||||
stage: prep
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
FDO_DISTRIBUTION_VERSION: '7.7.1908'
|
||||
FDO_DISTRIBUTION_TAG: $CENTOS_TAG
|
||||
FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC
|
||||
when: manual
|
||||
|
||||
tier3:centos:7.8.2003@prep:
|
||||
extends:
|
||||
- .fdo.container-build@centos
|
||||
stage: prep
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
FDO_DISTRIBUTION_VERSION: '7.8.2003'
|
||||
FDO_DISTRIBUTION_TAG: $CENTOS_TAG
|
||||
FDO_DISTRIBUTION_EXEC: $CENTOS_EXEC
|
||||
when: manual
|
||||
|
||||
tier3:centos:8.2.2004@prep:
|
||||
extends:
|
||||
- .fdo.container-build@centos
|
||||
|
|
@ -500,6 +456,18 @@ t_fedora:39:
|
|||
needs:
|
||||
- "tier2:fedora:39@prep"
|
||||
|
||||
t_fedora:40:
|
||||
extends:
|
||||
- .build@template
|
||||
- .fdo.distribution-image@fedora
|
||||
- .nm_artifacts_debug
|
||||
stage: tier2
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: '40'
|
||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||
needs:
|
||||
- "tier2:fedora:40@prep"
|
||||
|
||||
t_fedora:30:
|
||||
extends:
|
||||
- .build@template
|
||||
|
|
@ -704,30 +672,6 @@ t_debian:testing:
|
|||
needs:
|
||||
- "tier3:debian:testing@prep"
|
||||
|
||||
t_centos:7.5.1804:
|
||||
extends:
|
||||
- .build@template
|
||||
- .fdo.distribution-image@centos
|
||||
- .nm_artifacts_debug
|
||||
stage: tier2
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: '7.5.1804'
|
||||
FDO_DISTRIBUTION_TAG: $CENTOS_TAG
|
||||
needs:
|
||||
- "tier2:centos:7.5.1804@prep"
|
||||
|
||||
t_centos:7.9.2009:
|
||||
extends:
|
||||
- .build@template
|
||||
- .fdo.distribution-image@centos
|
||||
- .nm_artifacts_debug
|
||||
stage: tier2
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: '7.9.2009'
|
||||
FDO_DISTRIBUTION_TAG: $CENTOS_TAG
|
||||
needs:
|
||||
- "tier2:centos:7.9.2009@prep"
|
||||
|
||||
t_centos:8.1.1911:
|
||||
extends:
|
||||
- .build@template
|
||||
|
|
@ -776,42 +720,6 @@ t_centos:stream9:
|
|||
needs:
|
||||
- "tier2:centos:stream9@prep"
|
||||
|
||||
t_centos:7.6.1810:
|
||||
extends:
|
||||
- .build@template
|
||||
- .fdo.distribution-image@centos
|
||||
- .nm_artifacts_debug
|
||||
stage: tier3
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: '7.6.1810'
|
||||
FDO_DISTRIBUTION_TAG: $CENTOS_TAG
|
||||
needs:
|
||||
- "tier3:centos:7.6.1810@prep"
|
||||
|
||||
t_centos:7.7.1908:
|
||||
extends:
|
||||
- .build@template
|
||||
- .fdo.distribution-image@centos
|
||||
- .nm_artifacts_debug
|
||||
stage: tier3
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: '7.7.1908'
|
||||
FDO_DISTRIBUTION_TAG: $CENTOS_TAG
|
||||
needs:
|
||||
- "tier3:centos:7.7.1908@prep"
|
||||
|
||||
t_centos:7.8.2003:
|
||||
extends:
|
||||
- .build@template
|
||||
- .fdo.distribution-image@centos
|
||||
- .nm_artifacts_debug
|
||||
stage: tier3
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: '7.8.2003'
|
||||
FDO_DISTRIBUTION_TAG: $CENTOS_TAG
|
||||
needs:
|
||||
- "tier3:centos:7.8.2003@prep"
|
||||
|
||||
t_centos:8.2.2004:
|
||||
extends:
|
||||
- .build@template
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ distributions:
|
|||
versions:
|
||||
- '37'
|
||||
- '39'
|
||||
- '40'
|
||||
- name: fedora
|
||||
tier: 3
|
||||
versions:
|
||||
|
|
@ -60,8 +61,6 @@ distributions:
|
|||
- name: centos
|
||||
tier: 2
|
||||
versions:
|
||||
- '7.5.1804'
|
||||
- '7.9.2009'
|
||||
- '8.1.1911'
|
||||
- '8.3.2011'
|
||||
- 'stream8'
|
||||
|
|
@ -69,9 +68,6 @@ distributions:
|
|||
- name: centos
|
||||
tier: 3
|
||||
versions:
|
||||
- '7.6.1810'
|
||||
- '7.7.1908'
|
||||
- '7.8.2003'
|
||||
- '8.2.2004'
|
||||
- name: alpine
|
||||
tier: 2
|
||||
|
|
|
|||
|
|
@ -61,7 +61,6 @@ check_run_assert() {
|
|||
meson+gcc+docs+valgrind
|
||||
autotools+clang
|
||||
meson+clang
|
||||
autotools+gcc+docs+el7+py2
|
||||
rpm+autotools
|
||||
rpm+meson
|
||||
tarball
|
||||
|
|
@ -118,8 +117,6 @@ check_run_clean meson+gcc+docs+valgrind && BUILD_TYPE=meson CC=gcc WITH_DO
|
|||
check_run_clean autotools+clang && BUILD_TYPE=autotools CC=clang WITH_DOCS=0 contrib/scripts/nm-ci-run.sh
|
||||
check_run_clean meson+clang && BUILD_TYPE=meson CC=clang WITH_DOCS=0 contrib/scripts/nm-ci-run.sh
|
||||
|
||||
check_run_clean autotools+gcc+docs+el7+py2 && test $IS_CENTOS_7 = 1 && PYTHON=python2 BUILD_TYPE=autotools CC=gcc WITH_DOCS=1 contrib/scripts/nm-ci-run.sh
|
||||
|
||||
check_run_clean rpm+autotools && test $IS_FEDORA = 1 -o $IS_CENTOS = 1 && ./contrib/fedora/rpm/build_clean.sh -g -w crypto_gnutls -w debug -w iwd -w test -W meson
|
||||
check_run_clean rpm+meson && test $IS_FEDORA = 1 && ./contrib/fedora/rpm/build_clean.sh -g -w crypto_gnutls -w debug -w iwd -w test -w meson
|
||||
|
||||
|
|
|
|||
1
NEWS
1
NEWS
|
|
@ -10,6 +10,7 @@ Overview of changes since NetworkManager-1.44
|
|||
link local addresses on default wired connection.
|
||||
* Honor udev property ID_NET_MANAGED_BY to only manage an interface
|
||||
when set to "org.freedesktop.NetworkManager".
|
||||
* Drop build support with Python2. Python3 is now required.
|
||||
|
||||
=============================================
|
||||
NetworkManager-1.44
|
||||
|
|
|
|||
|
|
@ -303,21 +303,10 @@ BuildRequires: mobile-broadband-provider-info-devel
|
|||
BuildRequires: newt-devel
|
||||
%endif
|
||||
BuildRequires: /usr/bin/dbus-launch
|
||||
%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8
|
||||
BuildRequires: python3
|
||||
BuildRequires: python3-gobject-base
|
||||
BuildRequires: python3-dbus
|
||||
BuildRequires: python3-pexpect
|
||||
%else
|
||||
BuildRequires: python2
|
||||
BuildRequires: pygobject3-base
|
||||
BuildRequires: dbus-python
|
||||
BuildRequires: pexpect
|
||||
%if 0%{?rhel} >= 7 && %{with meson}
|
||||
BuildRequires: python36-dbus
|
||||
BuildRequires: python36-gobject
|
||||
%endif
|
||||
%endif
|
||||
BuildRequires: libselinux-devel
|
||||
BuildRequires: polkit-devel
|
||||
BuildRequires: jansson-devel
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue