From 514482b5ea96d9b7deaf11a595b9e80e6699eb68 Mon Sep 17 00:00:00 2001
From: Frode Nordahl <frode.nordahl@canonical.com>
Date: Fri, 29 Mar 2019 12:31:07 +0100
Subject: [PATCH] travis: Switch to ``xenial`` dist

Update installation sequence to fit the Travis Xenial environment.

This should save us some time on binary deps as we no longer need
to install snapd and kernel packages mandated by spectre/meltdown
in the Travis ``trusty`` image.
---
 .travis.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a2d4951..b31dccf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 sudo: true
+dist: xenial
 language: python
 python:
   - "3.6"
@@ -12,13 +13,11 @@ comment: |
   sudo back to ourself to activate lxd group membership executable search path
 script:
   - if [ $ENV = 'func-travis' ]; then
-       sudo apt-get -qq update;
-       sudo apt-get -y install snapd;
+       sudo apt remove -y --purge lxd lxd-client;
        sudo snap install lxd;
        sudo snap install juju --classic;
        sudo sh -c 'echo PATH=/snap/bin:$PATH >> /etc/environment';
        sudo lxd waitready;
-       sudo journalctl --no-pager -xe;
        sudo lxd init --auto;
        sudo usermod -a -G lxd travis;
        sudo su travis -c 'juju bootstrap --debug --no-gui localhost';