diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-08-28 14:24:32 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-08-28 14:24:32 +0200 |
| commit | 12e8557476174b8aeefba1e0a189b4d4896a8374 (patch) | |
| tree | b4277bbf01b85da5884b69be65dbfa957a79c5b1 | |
| parent | 918ebd600acba97ea64af7d1039339983fa44af4 (diff) | |
| download | NetworkManager-12e8557476174b8aeefba1e0a189b4d4896a8374.tar.gz | |
gitlab-ci: fix workarounds for Ubuntu 16.04 in tests
The detection for Ubuntu 16.04 was broken. By now /etc/os-release
contains
VERSION="16.04.7 LTS (Xenial Xerus)"
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rwxr-xr-x | contrib/scripts/nm-ci-install-valgrind-in-ubuntu1604.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dd91e3221a..a56b122e90 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,8 +44,8 @@ stages: - date '+%Y%m%d-%H%M%S'; dbus-uuidgen --ensure - date '+%Y%m%d-%H%M%S'; sed -i 's/^# \(pl_PL.UTF-8 .*\)$/\1/p' /etc/locale.gen ; true - date '+%Y%m%d-%H%M%S'; locale-gen pl_PL.UTF-8 - - date '+%Y%m%d-%H%M%S'; grep -q "VERSION=.16.04.6 LTS" /etc/os-release && pip3 install meson==0.53.2 - - date '+%Y%m%d-%H%M%S'; grep -q "VERSION=.16.04.6 LTS" /etc/os-release || pip3 install meson + - date '+%Y%m%d-%H%M%S'; grep -q "VERSION=.16.04.[0-9]\+ LTS" /etc/os-release && pip3 install meson==0.53.2 + - date '+%Y%m%d-%H%M%S'; grep -q "VERSION=.16.04.[0-9]\+ LTS" /etc/os-release || pip3 install meson - date '+%Y%m%d-%H%M%S'; contrib/scripts/nm-ci-install-valgrind-in-ubuntu1604.sh # iproute2 5.2.0 on debian:sid causes our unit tests to fail. diff --git a/contrib/scripts/nm-ci-install-valgrind-in-ubuntu1604.sh b/contrib/scripts/nm-ci-install-valgrind-in-ubuntu1604.sh index 1fd88d052b..864cce04be 100755 --- a/contrib/scripts/nm-ci-install-valgrind-in-ubuntu1604.sh +++ b/contrib/scripts/nm-ci-install-valgrind-in-ubuntu1604.sh @@ -13,7 +13,7 @@ set -exv # # Work around that by installing valgrind from bionic. -grep -q 'PRETTY_NAME="Ubuntu 16.04.6 LTS"' /etc/os-release || exit 0 +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 |