Merge pull request #265 from ajkannan/source-it-vars

Fix exported variable scope issue
googleapis · Oct 15, 2015 · 06661a9 · 06661a9
2 parents 03d2f19 + 35e3f81
commit 06661a9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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.
@@ -9,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