From c50c361a8b9a3bbf1a33f5659e492b481f065cd2 Mon Sep 17 00:00:00 2001 From: Adam Stokes Date: Wed, 12 Jul 2017 17:34:09 -0400 Subject: [PATCH] Expand integration tests to use stable/edge versions of juju (#155) Signed-off-by: Adam Stokes --- .travis.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9716fea..0a57c38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,14 +5,19 @@ python: - "3.5" before_install: - sudo add-apt-repository ppa:ubuntu-lxc/lxd-stable -y - - sudo add-apt-repository ppa:juju/daily -y - sudo apt-get update -q - - sudo apt-get install lxd juju -y + - sudo apt-get install lxd snapd -y - sudo usermod -a -G lxd $USER + - sudo service lxd start || true - sudo lxd init --auto install: pip install tox-travis -before_script: - - sudo -E sudo -u $USER -E bash -c "juju bootstrap localhost test" -script: tox -e py35,integration -after_script: - - sudo -E sudo -u $USER -E bash -c "juju destroy-controller --destroy-all-models -y test" +env: + - SNAP_CMD="sudo snap install juju --classic --stable" + - SNAP_CMD="sudo snap install juju --classic --edge" +script: + - (eval "$SNAP_CMD") + - sudo ln -s /snap/bin/juju /usr/bin/juju || true + - sudo -E sudo -u $USER -E bash -c "/snap/bin/juju bootstrap localhost test" + - tox -e py35,integration + - sudo -E sudo -u $USER -E bash -c "/snap/bin/juju destroy-controller --destroy-all-models -y test" + - sudo snap remove juju -- 2.17.1