From 73ccc02957e28eb96ab1204acd2c2b8c9a7a7a8a Mon Sep 17 00:00:00 2001 From: Ajay Kannan Date: Thu, 15 Oct 2015 14:18:57 -0700 Subject: [PATCH 1/2] Fix exported variable scope issue --- utilities/after_success.sh | 1 + utilities/integration_test_env.sh | 3 +++ utilities/verify.sh | 1 + 3 files changed, 5 insertions(+) create mode 100755 utilities/integration_test_env.sh diff --git a/utilities/after_success.sh b/utilities/after_success.sh index 2fb4efde34c2..26405bcd9db3 100755 --- a/utilities/after_success.sh +++ b/utilities/after_success.sh @@ -1,4 +1,5 @@ #!/bin/bash +source ./utilities/integration_test_env.sh # This script is used by Travis-CI to publish artifacts (binary, sorce and javadoc jars) when releasing snapshots. # This script is referenced in .travis.yml. diff --git a/utilities/integration_test_env.sh b/utilities/integration_test_env.sh new file mode 100755 index 000000000000..f7aca1a8a623 --- /dev/null +++ b/utilities/integration_test_env.sh @@ -0,0 +1,3 @@ +# Export test env variables +export GCLOUD_TESTS_PROJECT_ID="gcloud-devel" +export GCLOUD_TESTS_KEY=$TRAVIS_BUILD_DIR/signing-tools/gcloud-devel-travis.json diff --git a/utilities/verify.sh b/utilities/verify.sh index 33e660940c40..fa034532c9b5 100755 --- a/utilities/verify.sh +++ b/utilities/verify.sh @@ -1,4 +1,5 @@ #!/bin/bash +source ./utilities/integration_test_env.sh # This script is used by Travis-CI to run tests. # This script is referenced in .travis.yml. From 35e3f8150b6a13b729a10d88fac8132fd9530350 Mon Sep 17 00:00:00 2001 From: Ajay Kannan Date: Thu, 15 Oct 2015 15:01:45 -0700 Subject: [PATCH 2/2] remove extra exports --- utilities/verify.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/utilities/verify.sh b/utilities/verify.sh index fa034532c9b5..463180415e98 100755 --- a/utilities/verify.sh +++ b/utilities/verify.sh @@ -10,9 +10,6 @@ if [ "${TRAVIS_BRANCH}" == "master" -a "${TRAVIS_PULL_REQUEST}" == "false" ]; th mkdir $TRAVIS_BUILD_DIR/signing-tools chmod 700 $TRAVIS_BUILD_DIR/signing-tools tar xvf $TRAVIS_BUILD_DIR/signing-tools.tar -C $TRAVIS_BUILD_DIR/signing-tools - # Export test env variables - export GCLOUD_TESTS_PROJECT_ID="gcloud-devel" - export GCLOUD_TESTS_KEY=$TRAVIS_BUILD_DIR/signing-tools/gcloud-devel-travis.json # Run verify mvn verify else