From ac5db6aaf9643e90737ee0c9c8dc4f43488abdc5 Mon Sep 17 00:00:00 2001
From: Ajay Kannan <ajaykannan@google.com>
Date: Thu, 15 Oct 2015 12:26:00 -0700
Subject: [PATCH 1/3] clean before deploying

---
 utilities/after_success.sh | 2 +-
 utilities/verify.sh        | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/utilities/after_success.sh b/utilities/after_success.sh
index 4972992915ac..b495a72bde4f 100755
--- a/utilities/after_success.sh
+++ b/utilities/after_success.sh
@@ -32,7 +32,7 @@ if [ "${TRAVIS_JDK_VERSION}" == "oraclejdk7" -a "${TRAVIS_BRANCH}" == "master" -
 
         cd ..
         utilities/update_docs_version.sh # Update version in READMEs
-        mvn deploy -DskipTests=true --settings target/travis/settings.xml -P sign-deploy
+        mvn clean deploy --settings ~/.m2/settings.xml -P sign-deploy
     else
         mvn deploy -DskipTests=true -Dgpg.skip=true --settings target/travis/settings.xml
     fi
diff --git a/utilities/verify.sh b/utilities/verify.sh
index 47f8f1e7c0d4..b25c008da233 100755
--- a/utilities/verify.sh
+++ b/utilities/verify.sh
@@ -6,12 +6,12 @@
 if [ "${TRAVIS_BRANCH}" == "master" -a "${TRAVIS_PULL_REQUEST}" == "false" ]; then
     # 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 target/travis/signing-tools.tar -d
-    mkdir target/travis/signing-tools
-    chmod 700 target/travis/signing-tools
-    tar xvf target/travis/signing-tools.tar -C target/travis/signing-tools
+    mkdir $TRAVIS_BUILD_DIR/signing-tools
+    chmod 700 $TRAVIS_BUILD_DIR/signing-tools
+    tar xvf target/travis/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/target/travis/signing-tools/gcloud-devel-travis.json
+    export GCLOUD_TESTS_KEY=$TRAVIS_BUILD_DIR/signing-tools/gcloud-devel-travis.json
     # Run verify
     mvn verify
 else

From 49f9b3f0341e5624c6a0d43be90205a8d06b0346 Mon Sep 17 00:00:00 2001
From: Ajay Kannan <ajaykannan@google.com>
Date: Thu, 15 Oct 2015 13:22:57 -0700
Subject: [PATCH 2/3] clean and test for snapshot builds as well

---
 utilities/after_success.sh | 2 +-
 utilities/verify.sh        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/utilities/after_success.sh b/utilities/after_success.sh
index b495a72bde4f..20c0295cd8cd 100755
--- a/utilities/after_success.sh
+++ b/utilities/after_success.sh
@@ -34,7 +34,7 @@ if [ "${TRAVIS_JDK_VERSION}" == "oraclejdk7" -a "${TRAVIS_BRANCH}" == "master" -
         utilities/update_docs_version.sh # Update version in READMEs
         mvn clean deploy --settings ~/.m2/settings.xml -P sign-deploy
     else
-        mvn deploy -DskipTests=true -Dgpg.skip=true --settings target/travis/settings.xml
+        mvn clean deploy -Dgpg.skip=true --settings ~/.m2/settings.xml
     fi
 else
     echo "Not deploying artifacts. This is only done with non-pull-request commits to master branch with Oracle Java 7 builds."
diff --git a/utilities/verify.sh b/utilities/verify.sh
index b25c008da233..33e660940c40 100755
--- a/utilities/verify.sh
+++ b/utilities/verify.sh
@@ -5,10 +5,10 @@
 
 if [ "${TRAVIS_BRANCH}" == "master" -a "${TRAVIS_PULL_REQUEST}" == "false" ]; then
     # 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 target/travis/signing-tools.tar -d
+    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
     chmod 700 $TRAVIS_BUILD_DIR/signing-tools
-    tar xvf target/travis/signing-tools.tar -C $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

From 87d698b804e7f39b88c41b296346d9d567cd5193 Mon Sep 17 00:00:00 2001
From: Ajay Kannan <ajaykannan@google.com>
Date: Thu, 15 Oct 2015 13:33:39 -0700
Subject: [PATCH 3/3] skip tests for snapshot builds

---
 utilities/after_success.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utilities/after_success.sh b/utilities/after_success.sh
index 20c0295cd8cd..2fb4efde34c2 100755
--- a/utilities/after_success.sh
+++ b/utilities/after_success.sh
@@ -34,7 +34,7 @@ if [ "${TRAVIS_JDK_VERSION}" == "oraclejdk7" -a "${TRAVIS_BRANCH}" == "master" -
         utilities/update_docs_version.sh # Update version in READMEs
         mvn clean deploy --settings ~/.m2/settings.xml -P sign-deploy
     else
-        mvn clean deploy -Dgpg.skip=true --settings ~/.m2/settings.xml
+        mvn clean deploy -DskipTests=true -Dgpg.skip=true --settings ~/.m2/settings.xml
     fi
 else
     echo "Not deploying artifacts. This is only done with non-pull-request commits to master branch with Oracle Java 7 builds."