From 887fb6ce35a7187646b693af37cde1ef62abf89b Mon Sep 17 00:00:00 2001 From: Alexander Todorov Date: Mon, 13 Jan 2020 14:47:21 +0200 Subject: [PATCH] tests: Enable Elastic Network Adapter support for AWS - this is required for arm64 but is present in all latest kernels so doesn't seem to hurt - when registering the AMI mark its architecture properly --- tests/cli/test_build_and_deploy_aws.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/cli/test_build_and_deploy_aws.sh b/tests/cli/test_build_and_deploy_aws.sh index eefb7702..2ee7c7cb 100755 --- a/tests/cli/test_build_and_deploy_aws.sh +++ b/tests/cli/test_build_and_deploy_aws.sh @@ -134,7 +134,12 @@ __EOF__ fi # create an image from the imported selected snapshot + AMI_ARCH="$(uname -m)" + if [ "$AMI_ARCH" == "aarch64" ]; then + AMI_ARCH="arm64" + fi AMI_ID=`aws ec2 register-image --name "Composer-Test-$UUID" --virtualization-type hvm --root-device-name /dev/sda1 \ + --ena-support --architecture $AMI_ARCH \ --block-device-mappings "[{\"DeviceName\": \"/dev/sda1\", \"Ebs\": {\"SnapshotId\": \"$SNAPSHOT_ID\"}}]" | \ grep ImageId | cut -f4 -d'"'`