From bbd3aad2df3e3111be2a1066df00eb62ae899d86 Mon Sep 17 00:00:00 2001 From: Ajay Kannan Date: Fri, 22 Jan 2016 16:52:48 -0800 Subject: [PATCH] Source IT env vars only when necessary --- utilities/after_success.sh | 2 +- utilities/verify.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/utilities/after_success.sh b/utilities/after_success.sh index 73f5fa95dec3..be7484806c46 100755 --- a/utilities/after_success.sh +++ b/utilities/after_success.sh @@ -1,5 +1,4 @@ #!/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. @@ -11,6 +10,7 @@ echo "Travis JDK version: " ${TRAVIS_JDK_VERSION} if [ "${TRAVIS_JDK_VERSION}" == "oraclejdk7" ]; then mvn clean cobertura:cobertura coveralls:report if [ "${TRAVIS_PULL_REQUEST}" == "false" -a "${TRAVIS_BRANCH}" == "master" ]; then + source ./utilities/integration_test_env.sh SITE_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -Ev '(^\[|\w+:)') if [ "${SITE_VERSION##*-}" != "SNAPSHOT" ]; then # Deploy site if not a SNAPSHOT diff --git a/utilities/verify.sh b/utilities/verify.sh index d98e4ab53513..b29ab8d8f747 100755 --- a/utilities/verify.sh +++ b/utilities/verify.sh @@ -1,10 +1,9 @@ #!/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. if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then + source ./utilities/integration_test_env.sh # Get signing tools and API keyfile openssl aes-256-cbc -K $encrypted_631490ecae8f_key -iv $encrypted_631490ecae8f_iv -in target/travis/signing-tools.tar.enc -out $TRAVIS_BUILD_DIR/signing-tools.tar -d mkdir $TRAVIS_BUILD_DIR/signing-tools