diff --git a/.travis.yml b/.travis.yml index 9c72ab75a47..3cea8e9d2a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +sudo: true language: java jdk: - oraclejdk8 @@ -44,8 +45,6 @@ before_install: || true # Cross project - GOOGLE_APPLICATION_CREDENTIALS uses cloud-docs-tests, but BQ uses G_C_P (argh!) - export GOOGLE_CLOUD_PROJECT=java-docs-samples-tests -# Give Maven a bit more memory -- export MAVEN_OPTS='-XX:+PrintFlagsFinal -Xmx2g' # Skip the install step, since Maven will download the dependencies we need # when the test build runs. # http://stackoverflow.com/q/31945809/101923 @@ -57,3 +56,5 @@ after_success: branches: only: - master + - java8-master + diff --git a/travis.sh b/travis.sh index 60896e4d390..4d9af1a8ce7 100755 --- a/travis.sh +++ b/travis.sh @@ -19,6 +19,7 @@ set -x set -o pipefail shopt -s globstar + SKIP_TESTS=false if [ -z "$GOOGLE_APPLICATION_CREDENTIALS" ] ; then SKIP_TESTS=true @@ -64,6 +65,8 @@ common_travis_dir="$(travis_changed_files_parent)" [ -z "$common_travis_dir" ] || pushd "$common_travis_dir" +# Give Maven a bit more memory +export MAVEN_OPTS='-XX:+PrintFlagsFinal -Xmx2g -Xms512m' ./mvnw --batch-mode clean verify -e -DskipTests=$SKIP_TESTS | egrep -v "(^\[INFO\] Download|^\[INFO\].*skipping)" [ -z "$common_travis_dir" ] || popd