Merge lp:~ricardokirkner/ols-store-tests/fix-ols-vms into lp:~ubuntuone-pqm-team/ols-store-tests/store-acceptance-tests

[Ricardo Kirkner]

applied changes required for newest version of ols-vms

[Vincent Ladeuil (vila)]

Yup, that's the idea

review: Approve

[Ricardo Kirkner (ricardokirkner)]

review: Approve

=== modified file 'ols-vms.conf'
--- ols-vms.conf	2016-07-01 17:57:26 +0000
+++ ols-vms.conf	2016-07-11 12:29:33 +0000
@@ -1,15 +1,17 @@
 tests.packages = snapcraft, squashfs-tools, python3-requests, python3-pymacaroons
-vm.ssh_opts = -oUserKnownHostsFile=/dev/null,-oStrictHostKeyChecking=no,-A,-Y
-vm.ssh_authorized_keys = ~/.ssh/id_rsa.pub
 
 [store-acceptance-tests]
 vm.class = lxd
 vm.release = xenial
+vm.architecture = amd64
 vm.update = True
-vm.image = ubuntu:{vm.release}/amd64
+vm.locale = en_US.UTF-8
+lxd.image = ubuntu:{vm.release}/{vm.architecture}
 vm.packages = {tests.packages}, bzr, make
-# FIXME: This is ubuntone specific and should be in /etc/ols-vms.conf on the
-# jenkins slaves instead of here -- ricardokirkner 2016-07-01
-vm.root_script = setup-dns
-# The following needs to be run once the instance is up to finish the setup
-vm.uploaded_scripts = setup-dev-env
+# Not the best solution but good enough until jenkaas: this requires the
+# following 'secrets' file to exist on the dev host and on jenkins slaves
+# and contain 'export' statements for the env vars needed by the tests.
+# FIXME: A better solution would be a config file by host or by job
+# providing as many options as needed by the tests. -- vila 2016-07-08
+vm.uploaded_scripts = ~/.config/ols-store-tests/secrets
+vm.setup_scripts = setup-dev-env

=== modified file 'setup-dev-env' (properties changed: -x to +x)
=== removed file 'setup-dns'
--- setup-dns	2016-07-01 19:45:37 +0000
+++ setup-dns	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-cat <<EOF > /etc/resolvconf/resolv.conf.d/tail
-nameserver 10.55.32.1
-EOF
-systemctl restart resolvconf