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

mziccard · mziccard · commit 06661a961eb3 · 2015-10-16T00:05:55.000+02:00
Fix exported variable scope issue
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

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#!/bin/bash`
	`2`	`+source ./utilities/integration_test_env.sh`
`2`	`3`
`3`	`4`	`# This script is used by Travis-CI to publish artifacts (binary, sorce and javadoc jars) when releasing snapshots.`
`4`	`5`	`# This script is referenced in .travis.yml.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# Export test env variables`
	`2`	`+export GCLOUD_TESTS_PROJECT_ID="gcloud-devel"`
	`3`	`+export GCLOUD_TESTS_KEY=$TRAVIS_BUILD_DIR/signing-tools/gcloud-devel-travis.json`