Skip to content

Commit 2cef10d

Browse files
committed
[TEST] (Hundredth time's a charm) more Java8 JRE tweaks
1 parent ecb44ab commit 2cef10d

File tree

2 files changed

+1
-14
lines changed

2 files changed

+1
-14
lines changed

.travis.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ language: php
33
jdk:
44
- oraclejdk8
55

6-
addons:
7-
apt:
8-
packages:
9-
- oracle-java8-installer
10-
116
branches:
127
except:
138
- 0.4
@@ -29,6 +24,7 @@ env:
2924
- ES_TEST_HOST=http://localhost:9200
3025

3126
before_install:
27+
- java install oraclejdk8
3228
- ./travis/download_and_run_es.sh
3329

3430
install:

travis/download_and_run_es.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,8 @@ fi;
77

88
killall java 2>/dev/null
99

10-
11-
ORACLEJDK8_UJA_ALIAS="java-8-oracle"
12-
ORACLEJDK8_JAVA_HOME="/usr/lib/jvm/java-8-oracle/jre"
13-
14-
15-
echo "Switching to Oracle JDK8 ($ORACLEJDK8_UJA_ALIAS), JAVA_HOME will be set to $ORACLEJDK8_JAVA_HOME"
16-
export JAVA_HOME="$ORACLEJDK8_JAVA_HOME"
17-
1810
java -version
1911

20-
2112
echo "Downloading Elasticsearch v${ES_VERSION}-SNAPSHOT..."
2213

2314
ES_URL=$(curl -sS "https://esvm-props.kibana.rocks/builds" | jq -r ".branches[\"$ES_VERSION\"].zip")

0 commit comments

Comments
 (0)