diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2019-04-24 15:46:40 +0200 |
|---|---|---|
| committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2019-04-24 15:46:40 +0200 |
| commit | 225ea11602c4033955f8ec4e037fd60c94156b12 (patch) | |
| tree | 4f7012cba89df9f4c3405d014da1abebd6b01e3b | |
| parent | 51739c6829ef36d119a0a6681c1c288dfd8cc691 (diff) | |
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>
| -rw-r--r-- | packer/provision/baseline.sh | 5 | ||||
| -rw-r--r-- | packer/templates/basebuild-agl-test-slave.json | 2 | ||||
| -rw-r--r-- | packer/templates/basebuild-control-slave.json | 2 | ||||
| -rw-r--r-- | packer/templates/basebuild.json | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh index 66bd6bbc..351b9dd1 100644 --- 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 02c0f8b7..c003932b 100644 --- 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 b6bf1945..ace0cf7b 100644 --- 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 c65c9c37..8e181fe2 100644 --- 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" } |