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

- also fix equality comparison to use == for consistency

Cherry-picked from d3d7e072d9

Related: rhbz#1789308

tests/cli/test_build_and_deploy_aws.sh

@@ -140,6 +140,10 @@ __EOF__
     rlPhaseEnd
 
     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
         KEY_NAME=composer-$UUID
         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"
 
         # 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 \
             --count 1| grep InstanceId | cut -f4 -d'"'`
 

tests/cli/test_compose_sanity.sh

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