From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Tue, 29 Jan 2019 02:19:43 +0000 (+0100)
Subject: travis: switch to the "official" systemd-ci repository
X-Git-Tag: v241-rc2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8605a4b9eb1081a2f56745b57dc5d13a7637048e;p=thirdparty%2Fsystemd.git

travis: switch to the "official" systemd-ci repository

Now that add-apt-repository hasn't failed for almost two days on Semaphore
it should be safe to assume that the key has been propagated properly
and the repository is ready to be used on Travis CI.
---

diff --git a/travis-ci/managers/xenial.sh b/travis-ci/managers/xenial.sh
index 10ba4382f8a..65e44ab3a4d 100755
--- a/travis-ci/managers/xenial.sh
+++ b/travis-ci/managers/xenial.sh
@@ -3,7 +3,7 @@
 set -e
 set -x
 
-add-apt-repository ppa:pitti/systemd-semaphore -y
+add-apt-repository ppa:upstream-systemd-ci/systemd-ci -y
 apt-get update
 apt-get build-dep systemd -y
 apt-get install -y util-linux libmount-dev libblkid-dev liblzma-dev libqrencode-dev libmicrohttpd-dev iptables-dev liblz4-dev libcurl4-gnutls-dev unifont itstool kbd cryptsetup-bin net-tools isc-dhcp-client iputils-ping strace qemu-system-x86 linux-image-virtual mount libgpg-error-dev libxkbcommon-dev python-lxml python3-lxml python3-pip libcap-dev
@@ -12,8 +12,6 @@ pip3 install meson
 
 cd $REPO_ROOT
 
-sed -i 's/2\.30/2.27/' meson.build
-
 meson --werror -Db_sanitize=address,undefined -Dsplit-usr=true build
 ninja -v -C build
 make -C test/TEST-01-BASIC clean setup run TEST_NO_QEMU=yes NSPAWN_ARGUMENTS=--keep-unit RUN_IN_UNPRIVILEGED_CONTAINER=no