From 893dfbce5931a728de8b19b4039b4fbd254ebf44 Mon Sep 17 00:00:00 2001 From: Takuya ASADA Date: Wed, 1 Jan 2020 08:08:58 +0900 Subject: [PATCH] dist/ami: update packer to 1.5.1 Update Packer to 1.5.1. Needed to rename clean_ami_name -> clean_resource_name on scylla.json, since the variable name had been changed. Also fixed checksum verification code, trimmed unwanted extra strings from sha256sum output. --- dist/ami/build_ami.sh | 8 ++++---- dist/ami/scylla.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dist/ami/build_ami.sh b/dist/ami/build_ami.sh index 8d81f8d8a6..0324858641 100755 --- a/dist/ami/build_ami.sh +++ b/dist/ami/build_ami.sh @@ -194,16 +194,16 @@ if [ ! -f variables.json ]; then fi if [ ! -d packer ]; then - EXPECTED="5e51808299135fee7a2e664b09f401b5712b5ef18bd4bad5bc50f4dcd8b149a1 packer_1.3.2_linux_amd64.zip" - wget -nv https://releases.hashicorp.com/packer/1.3.2/packer_1.3.2_linux_amd64.zip -O packer_1.3.2_linux_amd64.zip - CSUM=`sha256sum packer_1.3.2_linux_amd64.zip` + EXPECTED="3305ede8886bc3fd83ec0640fb87418cc2a702b2cb1567b48c8cb9315e80047d" + wget -nv https://releases.hashicorp.com/packer/1.5.1/packer_1.5.1_linux_amd64.zip -O packer_1.5.1_linux_amd64.zip + CSUM=$(sha256sum packer_1.5.1_linux_amd64.zip|cut -d ' ' -f 1) if [ "$CSUM" != "$EXPECTED" ]; then echo "Error while downloading packer. Checksum doesn't match! ($CSUM)" exit 1 fi mkdir packer cd packer - unzip -x ../packer_1.3.2_linux_amd64.zip + unzip -x ../packer_1.5.1_linux_amd64.zip cd - fi diff --git a/dist/ami/scylla.json b/dist/ami/scylla.json index 506225ca91..869c2fec8a 100644 --- a/dist/ami/scylla.json +++ b/dist/ami/scylla.json @@ -36,7 +36,7 @@ "virtual_name": "ephemeral7" } ], - "ami_name": "{{user `ami_prefix`}}scylla_{{isotime | clean_ami_name}}", + "ami_name": "{{user `ami_prefix`}}scylla_{{isotime | clean_resource_name}}", "associate_public_ip_address": "{{user `associate_public_ip_address`}}", "sriov_support": true, "ena_support": true,