Implicitly specify ssh key directory/files for testing

this is to work around identity/sudo problems
This commit is contained in:
Alexander Todorov 2018-11-28 10:52:54 +02:00 committed by Alexander Todorov
parent ed63611cb7
commit 4b4f4bd0e0

View File

@ -145,10 +145,9 @@ __EOF__
rlPhaseStartTest "Start EC2 instance" rlPhaseStartTest "Start EC2 instance"
# 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
if [ ! -f ~/.ssh/id_rsa.pub ]; then SSH_KEY_DIR=`mktemp -d /tmp/composer-ssh-keys.XXXXXX`
rlRun -t -c "ssh-keygen -t rsa -N '' -f ~/.ssh/id_rsa" rlRun -t -c "ssh-keygen -t rsa -N '' -f $SSH_KEY_DIR/id_rsa"
fi 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/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 t2.small --key-name $KEY_NAME \
@ -186,7 +185,7 @@ __EOF__
fi fi
# verify we can login into that instance and maybe some other details # verify we can login into that instance and maybe some other details
rlRun -t -c "ssh -oStrictHostKeyChecking=no $CLOUD_USER@$IP_ADDRESS 'cat /etc/redhat-release'" rlRun -t -c "ssh -oStrictHostKeyChecking=no -i $SSH_KEY_DIR/id_rsa $CLOUD_USER@$IP_ADDRESS 'cat /etc/redhat-release'"
rlPhaseEnd rlPhaseEnd
rlPhaseStartCleanup rlPhaseStartCleanup
@ -196,7 +195,7 @@ __EOF__
rlRun -t -c "aws ec2 delete-snapshot --snapshot-id $SNAPSHOT_ID" rlRun -t -c "aws ec2 delete-snapshot --snapshot-id $SNAPSHOT_ID"
rlRun -t -c "aws s3 rm s3://$AWS_BUCKET/$AMI" rlRun -t -c "aws s3 rm s3://$AWS_BUCKET/$AMI"
rlRun -t -c "$CLI compose delete $UUID" rlRun -t -c "$CLI compose delete $UUID"
rlRun -t -c "rm -rf $AMI containers.json" rlRun -t -c "rm -rf $AMI $SSH_KEY_DIR containers.json"
rlPhaseEnd rlPhaseEnd
rlJournalEnd rlJournalEnd