scripts: Stop using apt-add-repository.

Unfortunately, apt-add-repository is highly unreliable and was causing
problems both in Travis CI and with developers provisioning their
environment.

scripts/lib/setup-apt-repo

@@ -1,15 +1,19 @@
 #!/bin/bash
 set -x
-set -x
 
-apt-get install -y lsb-release software-properties-common
+apt-get install -y lsb-release
+
+SCRIPTS_PATH="$(dirname $(dirname $0))"
+# Add the apt keys
+apt-key add "$SCRIPTS_PATH"/setup/zulip-ppa.asc
+apt-key add "$SCRIPTS_PATH"/setup/pgroonga-ppa.asc
 
-# First, install any updates from the apt repo that may be needed
-wget -qO - https://zulip.com/dist/keys/zulip-ppa.asc | apt-key add -
 release=$(lsb_release -sc)
 if [ "$release" = "trusty" ] || [ "$release" = "xenial" ]; then
     cat >/etc/apt/sources.list.d/zulip.list <<EOF
+deb http://ppa.launchpad.net/groonga/ppa/ubuntu $release main
 deb http://ppa.launchpad.net/tabbott/zulip/ubuntu $release main
+deb-src http://ppa.launchpad.net/groonga/ppa/ubuntu $release main
 deb-src http://ppa.launchpad.net/tabbott/zulip/ubuntu $release main
 EOF
 else

scripts/setup/pgroonga-ppa.asc

@@ -0,0 +1,27 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: SKS 1.1.5
+Comment: Hostname: keyserver.ubuntu.com
+
+mQINBFMyaEABEADEeUoP5AmhJZLHujySJaLKd1EXpIxkope3l4f/3tkbPTvV+jkyYvOSX/ii
+NAHyVGPrg4UjJI+kDLru1glFoabBs+J4xk2Lql9DcHW0x7YPgBXKCuj2sg84Teb0KTnAkAFI
+gd8w2kzs6l9itQbtCWei0wH+pGpp9YJqEqJhqc3U51LqUoMmYjTd2WTaN+BNVZOE3ws4Pa4+
+JyikyVOkuj/8q+jRF8LHWmeb76SuycvZMyGjJBnIs65wmmSN6VpeHtQA3NzIAV2FKuirEEuW
+5j7fD9L8WNTXy++K6NTvcd2InXgEWMG3rSGvfE2CvZSxKc/b9/xVdaG0LDtTTWPTosNdluUA
+K4M91Rz7UEvC06SWIdxqL8LdLOy/6OYaJxgh1exrEadRPWAKr+Ak7LDMiYPHq80npQzMh8Hn
+oUbQTaQ7KDFD17BZ7HauXn8rRmG/vpdQvKzswRoc3+mroh5hA6otjKdmOWAaD5AmNNxcvR3O
+iNjDTnX804pjrjHzmTAAxrPKwPxbPzFUeNB4Dt4BzUdesdbbZYJw5ojcvt9qCfLU0DOZXWk4
+t1nHvIQvGoG8cE63x1buVHcwFXwxocMUdn4iFam9srBlDx1G8TMlaKITNHvoc//evBU0arz0
+12UMDb8TXAT5zOW1W6szFSt1ZFn0By9Ab+I69UCIgB2iknMUtwARAQABtBlMYXVuY2hwYWQg
+UFBBIGZvciBHcm9vbmdhiQI4BBMBAgAiBQJTMmhAAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIe
+AQIXgAAKCRAzWefOy2ShV5p5EACWQ5QBQV86SAhjJHfRe1MSYVZtrA3v+wwS52V/C9sV9xlc
+Sn2IGIpUQM2816fVMTM23pvj9lzuP3PpcHl0vc5/gqSliRPAzXawgs8Gl+wB9FcwnKPPQfyR
+CWflFg5mc37+5wM/fTagL7V5S+mBcDrAyMOr7AFgt03nTCwoSaNHatF+pBZRqpyWByM6sqD+
+IF2ChI4O3QTI5H6HkbQStEHLGuz8G6UX1MBRZ9LrRl0hUqdc2F/dcogrtV5NWkimXvMcTBYB
+9dTeuvj7eSma6JemqJAXfCARq54KjYwcZHapzczJe3Kgj1tSqD8O1Z8fsT16P2b0tUnDgNjX
+PB9UQGsP5NLK+vGnVBg5xJA5GqaN69lsUsvPaFFngmKmykQQNlDk7Q3yrAvMJWwRPQ1c8eMq
+kkrkKBal8Rq/EJaoaoBG6SFx2cSAD4GMxPEL7G3qJeNJPSLVSOP9j9nGIZ4SETeGIKCNVgVF
+16iXIxwflvgJP+/1qX3/Qin2YDYCeGvFmJiy5s0VFM1IdK+znrUu0apoCSYVia1D9NJGEdKf
+l7m/Odtxycq9VP1DKD/k4spWqsdpiBkJMch7XWfa7KF12bwV/tHP4KqJ02/xqhSqk+Ru4A9R
+LjQFWXs4o/Qwf5qF7FlGhpFridr0xdxtLVmK7bV4Hogldx1bKbkOpCL29BY8GA==
+=NjhU
+-----END PGP PUBLIC KEY BLOCK-----

scripts/setup/zulip-ppa.asc

@@ -0,0 +1,27 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: SKS 1.1.5
+Comment: Hostname: keyserver.ubuntu.com
+
+mQINBFYFDSEBEAC3VnqG3OCOjL3wQ41taBnmrRZoTW6kBBZXY7Ts3o4/vWvleW0QOxUP5u2n
+qZ5qKL4e63e46M/6iroCI0c/M72lv8atCn8gyrGL3lLGB+pvfBeDAhMUFWQ0Rwkm0vxBceGS
+FwusblXgiTo7oa1ShTBwLG59Ej2MeTGYQnS5DqoppJZonJ6DSOMKf7Qf4m/9uiYu7LVSYeHQ
+l89o/0CR1fQtRRwwkoHHLvpUV18ZYllJxEPjbkKVjoXJHylXrYxhuKs+H5iIDmaDpwgvuVnd
++BnXXfylN7lbrDq7nMyx5tU1sSQwfKqyoWXxvIMSwUUWaNuc5Vkh0O0AMYh5YykcB1PEXmxy
+UUK9yOkvl5XIziBvZBSXRd4WLkYEE6+3Ipj2RqWCM9maHV5AgxrxJYv3VhzYRN1/WNGJ7bHD
+IV2/3qYUOSSFrG8JyHyf2+JllEkYKbLve+f7mOnDiCNn7AyUK0jEJh7ZavDg2wICIr8gJgqD
+YUBOCYQS4wWCBAJWYxAzn0yWSc0MbWTsm/3uAkmC//inF1T75s6buThphq3sQJU9SoXCyS8H
+qsc8fzVnBzTy6dM4mgDxucpQFiEOH/VR9aEf6RB+63HNfnkMc3cDlQCfqimifM/hd5TVZR2+
+XE5FNwNvEDNnrmau7zZvOMcVbUhbKCITv+TUiT/ihb39T0I/jQARAQABtBxMYXVuY2hwYWQg
+UFBBIGZvciBUaW0gQWJib3R0iQI4BBMBAgAiBQJWBQ0hAhsDBgsJCAcDAgYVCAIJCgsEFgID
+AQIeAQIXgAAKCRDoQkBHTiauR7iMEACFAA0+Ixxz5vRqJBF8IQt1LtnWJPqtPpab+SwBLHNx
+UdITDkuBilu1AzRvjl/lbo2nL4FpvQhhggB5KLDpM1sAiSpj5A3AMPEh3iFXOMzPi1igTyVv
+ZPo86NR1moMesIO3UmdIp6+w7le1SnOfpyjOCRUk/MjFm9tBCpF6Xcz19Cdm+0pKa8eW/Lvf
+aXboR0HP1lgiBiza97OxXtsv6olKhEOVF/QAGzZRKCN76hIYAw+Rjj1+PNLCWX3+Oa9Dq272
+g6ftdMSJym0E4Jzoic08zif0re9d4giFeoAV6T+COKAdUpxh5lr/LPTd/0DVJ1Q5SykvJ9C6
+1QqaRv2hBbQZKQ0SjyutfQeLkT0Ulb84qWRab5a4ip2p1F2ybT0Ka2k8wAbb4jI7TtqzlRix
+q5n7/O65JsWNEyhuUhM+QHacdD0aA3+NrKFDYN0dWtRu7ZkkjMDkt+345zyNy0nTUrsYYZ0O
+w19huWntqGwVpZK9xjAZNIC68HWoP0qJaDAuKiK0Pd/cc5zxS1Kuq165MT2flJwYkPJdhDGd
+sY37eu7hjSxvybjQKEV9TXyFR6C45MYnC+NUQAOB6Rno0GKSOmszgzPz5cdmPiV3QIQ9JXZ6
+Ij+kzTENAQJv1yl2/AINajY9mf0znT/j2YI0hEiM34wtM3Wda+wZtZrLPOdeqC/lrg==
+=t8gH
+-----END PGP PUBLIC KEY BLOCK-----

tools/provision.py

@@ -60,7 +60,7 @@ else:
 # Ideally we wouldn't need to install a dependency here, before we
 # know the codename.
 subprocess.check_call(["sudo", "apt-get", "update"])
-subprocess.check_call(["sudo", "apt-get", "install", "-y", "lsb-release", "software-properties-common"])
+subprocess.check_call(["sudo", "apt-get", "install", "-y", "lsb-release"])
 vendor = subprocess_text_output(["lsb_release", "-is"])
 codename = subprocess_text_output(["lsb_release", "-cs"])
 if not (vendor in SUPPORTED_PLATFORMS and codename in SUPPORTED_PLATFORMS[vendor]):
@@ -125,14 +125,6 @@ def main():
     os.chdir(ZULIP_PATH)
 
     run(["sudo", "./scripts/lib/setup-apt-repo"])
-
-    # Add groonga repository to get the pgroonga packages; retry if it fails :/
-    try:
-        run(["sudo", "add-apt-repository", "-y", "ppa:groonga/ppa"])
-    except subprocess.CalledProcessError:
-        print(WARNING + "`Could not add groonga; retrying..." + ENDC)
-        run(["sudo", "add-apt-repository", "-y", "ppa:groonga/ppa"])
-
     run(["sudo", "apt-get", "update"])
     run(["sudo", "apt-get", "-y", "install", "--no-install-recommends"] + APT_DEPENDENCIES[codename])