Merge lp:~maxiberta/ols-jenkaas/drop-personal-ppa into lp:~ols-jenkaas-admins/ols-jenkaas/trunk

[Maximiliano Bertacchini]

Replace ppa:vila/ppa by ppa:ubuntuone/ols-tests.

Additionally:
- Increase verbosity of ./testing/setup-jenkaas.
- Print LP token confirmation URL in ./testing/new-launchpad-oauth-token.

All needed packages are now in ppa:ubuntuone/ols-tests and I believe no extra porting is needed.

The old ppa contains forks with greater version numbers, in particular:

  $ sudo add-apt-repository ppa:vila/ppa
  $ sudo apt update && apt list --upgradable
  python-ols-config/xenial 1.0.2-0~95~ubuntu16.04.1 all [upgradable from: 1.0.2-0~93~ubuntu16.04.1]
  python-ols-tests/xenial 1.0.3-0~228~ubuntu16.04.1 all [upgradable from: 1.0.0-0~212~ubuntu16.04.1]
  python-ols-vms/xenial 1.3.1-0~324~ubuntu16.04.1 all [upgradable from: 1.2.5-0~303~ubuntu16.04.1]
  python3-ols-config/xenial 1.0.2-0~95~ubuntu16.04.1 all [upgradable from: 1.0.2-0~93~ubuntu16.04.1]
  python3-ols-vms/xenial 1.3.1-0~324~ubuntu16.04.1 all [upgradable from: 1.2.5-0~303~ubuntu16.04.1]

OLS-CONFIG: no changes.
  https://bazaar.launchpad.net/~vila/ols-config/trunk/view/head:/NEWS.rst
  https://bazaar.launchpad.net/~ubuntuone-hackers/ols-config/trunk/view/head:/NEWS.rst

OLS-TESTS: vila's fork contains a small fix for tests on py36.
  https://bazaar.launchpad.net/~vila/ols-tests/trunk/view/head:/NEWS.rst
  https://bazaar.launchpad.net/~ubuntuone-hackers/ols-tests/trunk/view/head:/NEWS.rst

OLS-VMS: vila's fork contains a number of fixes and improvements but nothing relevant to us afaict, but *lacks* a critical fix for lxd 3.0 present in the ~ubuntuone-hackers version.
  https://bazaar.launchpad.net/~vila/ols-vms/trunk/view/head:/NEWS.rst
  https://bazaar.launchpad.net/~ubuntuone-hackers/ols-vms/trunk/view/head:/NEWS.rst

Additionally, printing the LP URL is useful when running the script in an container with no graphics or browser.

[Daniel Manrique (roadmr)]

🔥 all personal PPAs.

We may want ols-tests' py36 fix, and we could potentially merge vila's ols-vms branch into ours with the lxd 3.0 fix and rebuild from that, but that can be done later once we've switched to the team PPA.

review: Approve

[Daniel Manrique (roadmr)]

I also think we'll need to remove all lxd containers on slaves so they're recreated without the evil PPA.

=== modified file 'ols-vms.conf'
--- ols-vms.conf	2018-02-06 16:21:06 +0000
+++ ols-vms.conf	2018-11-09 20:03:31 +0000
@@ -119,9 +119,7 @@
 # Allow nesting so test containers can be created (second level allows a
 # container to run ols-jenkaas self tests)
 lxd.nesting = 2
-# FIXME: Remove vila/ppa once the jenkins-slave package is available from
-# somewhere else (including a snap) -- vila 2016-06-20
-apt.sources = ppa:vila/ppa
+apt.sources = ppa:ubuntuone/ols-tests
 
 # One real slave to test with
 

=== modified file 'setup/seed-slave'
--- setup/seed-slave	2018-01-12 22:27:10 +0000
+++ setup/seed-slave	2018-11-09 20:03:31 +0000
@@ -2,10 +2,11 @@
 
 # Install the required dependencies
 
-sudo add-apt-repository -y ppa:ubuntuone/ols-tests
-# Note this PPA was deprecated, so we need to remove it explicitly
-# otherwise it'll remain forever on slaves which have it configured.
+# Note these PPAs were deprecated, so we need to remove them explicitly
+# otherwise they'll remain forever on slaves which have it configured.
 sudo rm -vf /etc/apt/sources.list.d/*lxd-stable*.list
+sudo rm -vf /etc/apt/sources.list.d/vila-*.list
+
 sudo add-apt-repository -y ppa:mojo-maintainers
 sudo apt-get update
 

=== modified file 'testing/new-launchpad-oauth-token'
--- testing/new-launchpad-oauth-token	2016-11-25 14:53:12 +0000
+++ testing/new-launchpad-oauth-token	2018-11-09 20:03:31 +0000
@@ -36,8 +36,8 @@
     url = creds.get_request_token(web_root=ns.launchpad)
 
     subprocess.call(['xdg-open', url])
-    sys.stderr.write("Authenticate from your browser (just opened),"
-                     " choose 'Change anything'\nthen press enter\n")
+    sys.stderr.write("Authenticate from your browser (" + url + "), \n"
+                     "choose 'Change anything' then press ENTER\n")
     sys.stdin.readline()
     try:
         creds.exchange_request_token_for_access_token(web_root=ns.launchpad)

=== modified file 'testing/setup-jenkaas'
--- testing/setup-jenkaas	2017-09-11 13:05:26 +0000
+++ testing/setup-jenkaas	2018-11-09 20:03:31 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh -ex
 
 # Setup a local jenkaas for testing purposes. This includes a master and a
 # single slave