specify oraclejdk for travis image instead of installing it each time

craigfowler · Jan 16, 2019 · 97c9393 · 97c9393
1 parent 3d9cad4
commit 97c9393
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,6 +16,7 @@ _bindings:
   python: &python
     language: python
     python: "2.7"
+    jdk: oraclejdk8
   ruby: &ruby
     language: ruby
     rvm: 2.0.0-p648
@@ -147,7 +148,6 @@ matrix:
       <<: *ruby
     - env: TASK=//rb:lint
       <<: *ruby
-before_install: ./scripts/travis/before_install.sh
 install: ./scripts/travis/install.sh
 before_script: ./scripts/travis/before_script.sh
 script: travis_wait ./scripts/travis/script.sh

diff --git a/scripts/travis/before_install.sh b/scripts/travis/before_install.sh
diff --git a/scripts/travis/before_script.sh b/scripts/travis/before_script.sh
@@ -2,7 +2,6 @@ set -ex
 
 sh /etc/init.d/xvfb start
 
-if [[ ! -z $TOXENV ]]; then
-  . jdk_switcher.sh && jdk_switcher use oraclejdk8
-  ./go py_prep_for_install_release
+if [[ ! -z $TOXENV ]]; then	
+  ./go py_prep_for_install_release	
 fi
diff --git a/scripts/travis/script.sh b/scripts/travis/script.sh
@@ -1,9 +1,5 @@
 set -ex
 
-if [[ ! -z $TOXENV ]]; then
-  . jdk_switcher.sh && jdk_switcher use oraclejdk8
-fi
-
 if [[ $TOXENV == *"remote"* ]]; then
   ./go selenium-server-standalone
 fi