almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

AWS test: take into account different instance type for non x86

Browse Source 
- also fix equality comparison to use == for consistency

Cherry-picked from d3d7e072d9

Related: rhbz#1789308
This commit is contained in:
Alexander Todorov 2020-01-09 12:40:02 +02:00 committed by Brian C. Lane
parent 17ce6ee4e4
commit 69589123b7
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/cli/test_build_and_deploy_aws.sh
View File

@ -140,6 +140,10 @@ __EOF__
rlPhaseEnd rlPhaseEnd
rlPhaseStartTest "Start EC2 instance" rlPhaseStartTest "Start EC2 instance"
INSTANCE_TYPE="t2.small"
if [ "$(uname -m)" == "aarch64" ]; then
INSTANCE_TYPE="a1.medium"
fi
# generate new ssh key and import it into EC2 # generate new ssh key and import it into EC2
KEY_NAME=composer-$UUID KEY_NAME=composer-$UUID
SSH_KEY_DIR=`mktemp -d /tmp/composer-ssh-keys.XXXXXX` SSH_KEY_DIR=`mktemp -d /tmp/composer-ssh-keys.XXXXXX`
@ -147,7 +151,7 @@ __EOF__
rlRun -t -c "aws ec2 import-key-pair --key-name $KEY_NAME --public-key-material file://$SSH_KEY_DIR/id_rsa.pub" rlRun -t -c "aws ec2 import-key-pair --key-name $KEY_NAME --public-key-material file://$SSH_KEY_DIR/id_rsa.pub"
# start a new instance with selected ssh key, enable ssh # start a new instance with selected ssh key, enable ssh
INSTANCE_ID=`aws ec2 run-instances --image-id $AMI_ID --instance-type t2.small --key-name $KEY_NAME \ INSTANCE_ID=`aws ec2 run-instances --image-id $AMI_ID --instance-type $INSTANCE_TYPE --key-name $KEY_NAME \
--security-groups allow-ssh --instance-initiated-shutdown-behavior terminate --enable-api-termination \ --security-groups allow-ssh --instance-initiated-shutdown-behavior terminate --enable-api-termination \
--count 1| grep InstanceId | cut -f4 -d'"'` --count 1| grep InstanceId | cut -f4 -d'"'`

2
tests/cli/test_compose_sanity.sh
View File

@ -11,7 +11,7 @@ CLI="${CLI:-./src/bin/composer-cli}"
rlJournalStart rlJournalStart
rlPhaseStartTest "compose types" rlPhaseStartTest "compose types"
if [ "$(uname -m)" = "x86_64" ]; then if [ "$(uname -m)" == "x86_64" ]; then
rlAssertEquals "lists all supported types" \ rlAssertEquals "lists all supported types" \
"`$CLI compose types | xargs`" "alibaba ami ext4-filesystem google live-iso openstack partitioned-disk qcow2 tar vhd vmdk" "`$CLI compose types | xargs`" "alibaba ami ext4-filesystem google live-iso openstack partitioned-disk qcow2 tar vhd vmdk"
elif [ "$(uname -m)" == "aarch64" ]; then elif [ "$(uname -m)" == "aarch64" ]; then