diff --git a/.travis.yml b/.travis.yml index b9efe5d11..a37d81cbb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ --- -script: cd tests && ./run_ec2 progrium +script: cd tests && ./run_ec2 test before_install: - "sudo apt-get install -y ec2-api-tools" - "sudo apt-get install -y s3cmd" @@ -7,6 +7,7 @@ before_install: - "sed --in-place \"s|secret_key|secret_key = $AWS_SECRET_KEY|\" .s3cfg" - "s3cmd -c .s3cfg get s3://progrium-private/ec2_cert.pem /tmp/cert" - "s3cmd -c .s3cfg get s3://progrium-private/ec2_pk.pem /tmp/pk" + - "mkdir -p ~/.ssh && s3cmd -c .s3cfg get s3://progrium-private/test.pem ~/.ssh/id_rsa" env: global: - EC2_CERT=/tmp/cert diff --git a/tests/apps/nodejs-express/check_deploy b/tests/apps/nodejs-express/check_deploy index 3bb12d4c4..ce0ef707f 100755 --- a/tests/apps/nodejs-express/check_deploy +++ b/tests/apps/nodejs-express/check_deploy @@ -1,3 +1,3 @@ #!/bin/bash set -e -test "$(curl $1)" == "nodejs/express2" \ No newline at end of file +test "$(curl $1)" == "nodejs/express" \ No newline at end of file diff --git a/tests/run_ec2 b/tests/run_ec2 index d62934fa6..1dfaf9763 100755 --- a/tests/run_ec2 +++ b/tests/run_ec2 @@ -1,4 +1,5 @@ #!/bin/bash +set -e KEYNAME="$1" indent() { sed "s/^/ /"; } echo "-----> Booting EC2 instance..."