4 files changed, 10 insertions, 4 deletions
diff --git a/packer/provision/agl_dependencies.sh b/packer/provision/agl_dependencies.sh
index ed9dce66..2d6bdbf9 100644
--- a/packer/provision/agl_dependencies.sh
+++ b/packer/provision/agl_dependencies.sh
@@ -25,10 +25,16 @@ DEBIAN_FRONTEND=noninteractive apt-get update && \
                        libtool libglib2.0-dev libarchive-dev python-git git python python-minimal repo \
                        tree rsync python-yaml python-requests curl tar docker.io pandoc python3 \
                        ruby-all-dev ruby-ffi ruby-ffi-* jekyll ruby-redcarpet mkdocs \
-                       python-pip python-simplejson g++-multilib make zip unzip iperf3
+                       python-pip python-simplejson g++-multilib make zip unzip iperf3 \
+		       debian-keyring debian-archive-keyring
 
 DEBIAN_FRONTEND=noninteractive apt-get install -y -t jessie-backports lava-tool=0.19-1~bpo8+1
 
+# Adding stretch-backports for lavacli
+echo "deb http://deb.debian.org/debian/ stretch-backports main" >> /etc/apt/sources.list
+
+DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y -t stretch-backports lavacli
+
 # we have a build blocker wrt useradd - I assume it is caused by /bin/sh being dash
 # systemd: Performing useradd with
 echo "dash dash/sh boolean false" | debconf-set-selections
diff --git a/packer/templates/basebuild-agl-test-slave.json b/packer/templates/basebuild-agl-test-slave.json
index e6e3d34b..02c0f8b7 100644
--- a/packer/templates/basebuild-agl-test-slave.json
+++ b/packer/templates/basebuild-agl-test-slave.json
@@ -28,7 +28,7 @@
       ],
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `cloud_user`}}",
-      "flavor": "v1-standard-16",
+      "flavor": "v2-standard-16-iops",
       "metadata": {
         "ci_managed": "yes"
       }
diff --git a/packer/templates/basebuild-control-slave.json b/packer/templates/basebuild-control-slave.json
index 9a29d85e..b6bf1945 100644
--- a/packer/templates/basebuild-control-slave.json
+++ b/packer/templates/basebuild-control-slave.json
@@ -28,7 +28,7 @@
       ],
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `cloud_user`}}",
-      "flavor": "v1-standard-16",
+      "flavor": "v2-standard-16-iops",
       "metadata": {
         "ci_managed": "yes"
       }
diff --git a/packer/templates/basebuild.json b/packer/templates/basebuild.json
index ba5e1a8a..c65c9c37 100644
--- a/packer/templates/basebuild.json
+++ b/packer/templates/basebuild.json
@@ -28,7 +28,7 @@
       ],
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `cloud_user`}}",
-      "flavor": "v1-standard-16",
+      "flavor": "v2-standard-16-iops",
       "metadata": {
         "ci_managed": "yes"
       }