diff --git a/.travis.yml b/.travis.yml index 796ba78e08b7..ab421366db6a 100644 --- a/.travis.yml +++ b/.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/utilities/after_success.sh b/utilities/after_success.sh index 600d214958f5..8752c071583d 100755 --- a/utilities/after_success.sh +++ b/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/utilities/verify.sh b/utilities/verify.sh new file mode 100755 index 000000000000..47f8f1e7c0d4 --- /dev/null +++ b/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