mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-21 10:14:41 +00:00
ci: drop Ubuntu 16.04
It's sad, old and unsupported. Also its gettext is old and smells of elderberries.
This commit is contained in:
Lubomir Rintel
parent
978d8eb699
commit
9fdb6bea44
|
|
@ -47,11 +47,11 @@ variables:
|
|||
#
|
||||
# This is done by running `ci-fairy generate-template` and possibly bump
|
||||
# ".default_tag".
|
||||
FEDORA_TAG: '2022-06-25.1-c968ffde7c4c'
|
||||
UBUNTU_TAG: '2022-06-25.1-91c79dfac3d1'
|
||||
DEBIAN_TAG: '2022-06-25.1-91c79dfac3d1'
|
||||
CENTOS_TAG: '2022-06-25.1-c968ffde7c4c'
|
||||
ALPINE_TAG: '2022-06-25.1-58b83b32e0c4'
|
||||
FEDORA_TAG: '2022-06-27.0-8441692e0ce9'
|
||||
UBUNTU_TAG: '2022-06-27.0-d5ae0b779ff0'
|
||||
DEBIAN_TAG: '2022-06-27.0-d5ae0b779ff0'
|
||||
CENTOS_TAG: '2022-06-27.0-8441692e0ce9'
|
||||
ALPINE_TAG: '2022-06-27.0-be0e42c19eb0'
|
||||
|
||||
FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh'
|
||||
UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh'
|
||||
|
|
@ -167,16 +167,6 @@ fedora:37@container-prep:
|
|||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||
FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
|
||||
|
||||
ubuntu:16.04@container-prep:
|
||||
extends:
|
||||
- .fdo.container-build@ubuntu
|
||||
stage: prep
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
FDO_DISTRIBUTION_VERSION: '16.04'
|
||||
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
|
||||
FDO_DISTRIBUTION_EXEC: $UBUNTU_EXEC
|
||||
|
||||
ubuntu:18.04@container-prep:
|
||||
extends:
|
||||
- .fdo.container-build@ubuntu
|
||||
|
|
@ -473,15 +463,6 @@ fedora:37@container-clean:
|
|||
FDO_DISTRIBUTION_VERSION: '37'
|
||||
FDO_DISTRIBUTION_TAG: $FEDORA_TAG
|
||||
|
||||
ubuntu:16.04@container-clean:
|
||||
extends:
|
||||
- .container-clean
|
||||
variables:
|
||||
GIT_STRATEGY: none
|
||||
CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/ubuntu/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
|
||||
FDO_DISTRIBUTION_VERSION: '16.04'
|
||||
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
|
||||
|
||||
ubuntu:18.04@container-clean:
|
||||
extends:
|
||||
- .container-clean
|
||||
|
|
@ -773,18 +754,6 @@ t_fedora:37:
|
|||
- "fedora:37@container-prep"
|
||||
when: manual
|
||||
|
||||
t_ubuntu:16.04:
|
||||
extends:
|
||||
- .build@template
|
||||
- .fdo.distribution-image@ubuntu
|
||||
- .nm_artifacts_debug
|
||||
variables:
|
||||
FDO_DISTRIBUTION_VERSION: '16.04'
|
||||
FDO_DISTRIBUTION_TAG: $UBUNTU_TAG
|
||||
needs:
|
||||
- "ubuntu:16.04@container-prep"
|
||||
when: manual
|
||||
|
||||
t_ubuntu:18.04:
|
||||
extends:
|
||||
- .build@template
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
#
|
||||
|
||||
# We're happy to rebuild all containers when one changes.
|
||||
.default_tag: &default_tag '2022-06-25.1'
|
||||
.default_tag: &default_tag '2022-06-27.0'
|
||||
|
||||
|
||||
# The list of all distributions we want to create job for.
|
||||
|
|
@ -30,7 +30,6 @@ distributions:
|
|||
tag: *default_tag
|
||||
base_type: debian
|
||||
versions:
|
||||
- '16.04'
|
||||
- '18.04'
|
||||
- '20.04'
|
||||
- '22.04'
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
set -ex
|
||||
|
||||
grep -q '^VERSION=.16.04.[0-9]\+ LTS' /etc/os-release && IS_UBUNTU_1604=1 || IS_UBUNTU_1604=0
|
||||
grep -q '^VERSION=.\(9 (stretch)\|18.04.[0-9]\+ LTS\)' /etc/os-release && IS_DEBIAN_9=1 || IS_DEBIAN_9=0
|
||||
|
||||
if [ $IS_DEBIAN_9 = 1 ]; then
|
||||
|
|
@ -28,12 +27,7 @@ dbus-uuidgen --ensure
|
|||
sed -i 's/^# \(pl_PL.UTF-8 .*\)$/\1/p' /etc/locale.gen || true
|
||||
locale-gen pl_PL.UTF-8
|
||||
|
||||
if [ $IS_UBUNTU_1604 = 1 ]; then
|
||||
pip3 install meson==0.53.2
|
||||
contrib/scripts/nm-ci-install-valgrind-in-ubuntu1604.sh
|
||||
else
|
||||
pip3 install meson
|
||||
fi
|
||||
pip3 install meson
|
||||
|
||||
# iproute2 5.2.0 on debian:sid causes our unit tests to fail.
|
||||
# Downgrade to a working version. See https://www.spinics.net/lists/netdev/msg584916.html
|
||||
|
|
|
|||
|
|
@ -95,11 +95,3 @@ install_ignore_missing \
|
|||
libgcrypt11-dev \
|
||||
\
|
||||
#end
|
||||
|
||||
# Old. Present in Ubuntu 16.04, not in Ubuntu 18.04
|
||||
# software-properties-common
|
||||
install_ignore_missing \
|
||||
libgnutls-dev \
|
||||
python-software-properties \
|
||||
\
|
||||
#end
|
||||
|
|
|
|||
|
|
@ -1,36 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -exv
|
||||
|
||||
# Ubuntu 16.04 (trusty) ships a valgrind version where __get_cpuid() announces
|
||||
# rdrand support, but later valgrind crashes with unsupported opcode.
|
||||
#
|
||||
# See https://bugs.kde.org/show_bug.cgi?id=353370#c9
|
||||
# https://bugs.launchpad.net/ubuntu/+source/valgrind/+bug/1501545
|
||||
#
|
||||
# We call rdrand for hash-tables of systemd:
|
||||
# https://github.com/systemd/systemd/blob/e7b621ee1f1abfbcaae1cd17da4d815daf218679/src/basic/random-util.c#L36
|
||||
#
|
||||
# Work around that by installing valgrind from bionic.
|
||||
|
||||
grep -q 'PRETTY_NAME="Ubuntu 16.04.[0-9]\+ LTS"' /etc/os-release || exit 0
|
||||
dpkg -s valgrind | grep -q 'Version: 1:3.11.0-1ubuntu4.2$' || exit 0
|
||||
|
||||
|
||||
cat <<EOF > /etc/apt/sources.list.d/bionic1804.list
|
||||
deb http://us.archive.ubuntu.com/ubuntu/ bionic main
|
||||
EOF
|
||||
|
||||
cat <<EOF > /etc/apt/preferences.d/bionic1804.pref
|
||||
Package: *
|
||||
Pin: release n=bionic
|
||||
Pin-Priority: -10
|
||||
|
||||
Package: valgrind
|
||||
Pin: release n=bionic
|
||||
Pin-Priority: 500
|
||||
EOF
|
||||
|
||||
apt-get update
|
||||
|
||||
apt-get install valgrind -y
|
||||
Loading…
Reference in a new issue