From a3efbfdf980da8b946602bc9ae4f509766945a09 Mon Sep 17 00:00:00 2001
From: Trung Nguyen <24930+trung@users.noreply.github.com>
Date: Tue, 7 Apr 2020 17:44:01 -0400
Subject: [PATCH] travis: update VM to use JRE11 to fix acceptance tests
 failure for PR (#964)

- Update VM to Xenial
- Update to Tessera 0.10.4
- Update Gauge to 1.0.8
---
 .travis.yml                                |  6 +++---
 build/travis-install-linux.sh              | 15 +++------------
 build/travis-run-acceptance-tests-linux.sh |  4 +++-
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a4dc1b520..3a8069b83 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ matrix:
     - if: tag IS blank AND type = pull_request
       name: acceptance-tests-raft
       os: linux
-      dist: trusty
+      dist: xenial
       git:
         submodules: false
       cache:
@@ -40,7 +40,7 @@ matrix:
     - if: tag IS blank AND type = pull_request
       name: acceptance-tests-istanbul
       os: linux
-      dist: trusty
+      dist: xenial
       git:
         submodules: false
       cache:
@@ -57,7 +57,7 @@ matrix:
     - if: tag IS blank AND type = pull_request
       name: acceptance-tests-clique
       os: linux
-      dist: trusty
+      dist: xenial
       git:
         submodules: false
       cache:
diff --git a/build/travis-install-linux.sh b/build/travis-install-linux.sh
index e785ec6f2..6140eb7df 100755
--- a/build/travis-install-linux.sh
+++ b/build/travis-install-linux.sh
@@ -6,19 +6,10 @@ echo "---> installing tools ..."
 sudo apt-get update
 # upgrade dpkg to fix issue with trusty: dpkg-deb: error
 sudo apt-get -y install dpkg
-# Travis pre-installs jdk11 by default.
-# However, Tessera 0.8 requires jre8 to run so we use jdk_switcher utility from Travis
-if test -f ${HOME}/.jdk_switcher_rc; then
-    . ${HOME}/.jdk_switcher_rc
-fi
-if test -f /opt/jdk_switcher/jdk_switcher.sh; then
-    . /opt/jdk_switcher/jdk_switcher.sh
-fi
-jdk_switcher use openjdk8
 java -version
 mvn --version
 
-sudo wget https://github.com/ethereum/solidity/releases/download/v0.5.4/solc-static-linux -O /usr/local/bin/solc
+sudo wget https://github.com/ethereum/solidity/releases/download/v0.5.4/solc-static-linux -O /usr/local/bin/solc -q
 sudo chmod +x /usr/local/bin/solc
 solc --version
 echo "---> tools installation done"
@@ -36,11 +27,11 @@ git clone https://github.com/jpmorganchase/quorum-cloud.git ${TRAVIS_HOME}/quoru
 echo "---> cloning done"
 
 echo "---> getting tessera jar ..."
-wget https://github.com/jpmorganchase/tessera/releases/download/tessera-0.8/tessera-app-0.8-app.jar -O $HOME/tessera.jar -q
+wget https://oss.sonatype.org/service/local/repositories/releases/content/com/jpmorgan/quorum/tessera-app/0.10.4/tessera-app-0.10.4-app.jar -O $HOME/tessera.jar -q
 echo "---> tessera done"
 
 echo "---> getting gauge jar ..."
-wget https://github.com/getgauge/gauge/releases/download/v1.0.7/gauge-1.0.7-linux.x86_64.zip -O gauge.zip -q
+wget https://github.com/getgauge/gauge/releases/download/v1.0.8/gauge-1.0.8-linux.x86_64.zip -O gauge.zip -q
 sudo unzip -o gauge.zip -d /usr/local/bin
 gauge telemetry off
 cd ${TRAVIS_HOME}/quorum-acceptance-tests
diff --git a/build/travis-run-acceptance-tests-linux.sh b/build/travis-run-acceptance-tests-linux.sh
index 7652cf0d3..66ad3c560 100755
--- a/build/travis-run-acceptance-tests-linux.sh
+++ b/build/travis-run-acceptance-tests-linux.sh
@@ -2,6 +2,7 @@
 set -e
 # start network and run acceptance tests
 echo "---> start quorum network for consensus ${TF_VAR_consensus_mechanism} ..."
+java --version
 export PATH=${TRAVIS_BUILD_DIR}/build/bin:$PATH
 export TESSERA_JAR=${HOME}/tessera.jar
 cd ${TRAVIS_HOME}/quorum-cloud/travis/4nodes
@@ -11,8 +12,9 @@ echo "---> network started"
 cd ${TRAVIS_HOME}/quorum-acceptance-tests
 cp config/application-local.4nodes.yml config/application-local.yml
 echo "---> run acceptance tests for consensus ${TF_VAR_consensus_mechanism} ..."
+java --version
 ./src/travis/run_tests.sh
 echo "---> acceptance tests finished"
 echo "---> stop the network..."
 ${TRAVIS_HOME}/quorum-cloud/travis/4nodes/stop.sh
-echo "---> network stopped"
+echo "---> network stopped"
\ No newline at end of file