---

mziccard · mziccard · commit 489bdf737e14 · 2015-10-07T13:17:39.000+02:00
yaml --- r: 933 b: refs/heads/master c: a1e3cc4 h: refs/heads/master i: 931: dd51f92 v: v3
diff --git a/[refs] b/[refs]
@@ -1,4 +1,4 @@
 ---
-refs/heads/master: 3f9f621b755e9ac3fd8af399e7ddeea098163aa4
+refs/heads/master: a1e3cc409e9235caf5e512423ff68709a39bf436
 refs/heads/travis: 0fa997e2fc9c6b61b2d91e6d163655aae67d44b6
 refs/heads/gh-pages: 5a10432ecc75f29812e33a8236c900379509fe99
diff --git a/trunk/.travis.yml b/trunk/.travis.yml
@@ -8,7 +8,8 @@ before_install:
 - git clone -b travis `git config --get remote.origin.url` target/travis
 - cp target/travis/settings.xml ~/.m2/settings.xml
 install: mvn install -DskipTests=true -Dgpg.skip=true
-script: mvn verify
+script: 
+- utilities/verify.sh
 branches:
   only:
   - master
diff --git a/trunk/utilities/after_success.sh b/trunk/utilities/after_success.sh
@@ -11,12 +11,6 @@ if [ "${TRAVIS_JDK_VERSION}" == "oraclejdk7" -a "${TRAVIS_BRANCH}" == "master" -
 
     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
-        # Get signing tools
-        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
-
         # Deploy site if not a SNAPSHOT
         git config --global user.name "travis-ci"
         git config --global user.email "travis@travis-ci.org"
diff --git a/trunk/utilities/verify.sh b/trunk/utilities/verify.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# This script is used by Travis-CI to run tests.
+# This script is referenced in .travis.yml.
+
+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
+    # 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
+    # Run verify
+    mvn verify
+else
+    mvn verify -DskipITs
+fi
