Redo new baseimages with packer vers 1.4.0

and use the new image_disk_format

Change-Id: I17fa60f6013d5382237cdb100717cc9776945ac5
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh
index 66bd6bb..351b9dd 100644 (file)
--- a/packer/provision/baseline.sh
+++ b/packer/provision/baseline.sh
@@ -139,10 +139,11 @@ EOF
 
     # The following installs hashicorp's packer binary which is required  for
     # ci-management-{verify,merge}-packer jobs
+    export PACKERVERS=1.4.0
     mkdir /tmp/packer
     cd /tmp/packer
-    wget https://releases.hashicorp.com/packer/1.0.0/packer_1.0.0_linux_amd64.zip
-    unzip packer_1.0.0_linux_amd64.zip -d /usr/local/bin/
+    wget -nd -c "https://releases.hashicorp.com/packer/${PACKERVERS}/packer_${PACKERVERS}_linux_amd64.zip"
+    unzip packer_${PACKERVERS}_linux_amd64.zip -d /usr/local/bin/
     # rename packer to avoid conflict with binary in cracklib
     mv /usr/local/bin/packer /usr/local/bin/packer.io
 

diff --git a/packer/templates/basebuild-agl-test-slave.json b/packer/templates/basebuild-agl-test-slave.json
index 02c0f8b..c003932 100644 (file)
--- a/packer/templates/basebuild-agl-test-slave.json
+++ b/packer/templates/basebuild-agl-test-slave.json
@@ -29,6 +29,8 @@
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `cloud_user`}}",
       "flavor": "v2-standard-16-iops",
+      "image_disk_format": "qcow2",
+      "use_blockstorage_volume": true,
       "metadata": {
         "ci_managed": "yes"
       }

diff --git a/packer/templates/basebuild-control-slave.json b/packer/templates/basebuild-control-slave.json
index b6bf194..ace0cf7 100644 (file)
--- a/packer/templates/basebuild-control-slave.json
+++ b/packer/templates/basebuild-control-slave.json
@@ -29,6 +29,8 @@
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `cloud_user`}}",
       "flavor": "v2-standard-16-iops",
+      "image_disk_format": "qcow2",
+      "use_blockstorage_volume": true,
       "metadata": {
         "ci_managed": "yes"
       }

diff --git a/packer/templates/basebuild.json b/packer/templates/basebuild.json
index c65c9c3..8e181fe 100644 (file)
--- a/packer/templates/basebuild.json
+++ b/packer/templates/basebuild.json
@@ -29,6 +29,8 @@
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `cloud_user`}}",
       "flavor": "v2-standard-16-iops",
+      "image_disk_format": "qcow2",
+      "use_blockstorage_volume": true,
       "metadata": {
         "ci_managed": "yes"
       }