commit e29485aea49ed1b6e798e1e8c0c63ecb1b4c5e93
author Martin Polreich <polreichmartin@gmail.com> Wed Apr 04 12:40:58 2018 +0200
committer Martin Polreich <polreichmartin@gmail.com> Wed Apr 04 13:24:08 2018 +0200
tree 88a4ce9e5c58aaea92e6a0bf77c454845e816366
parent 628083309dec5e1d81ba281670545e58db2e0358

Fix tests

Change-Id: I91e1430ee6a5e2d4107fc2cc79117dcfba2da596

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 7d9b5c1..dbd573c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,6 @@
   - bundle install
 
 env:
-    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=openjdk-7
     - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=openjdk-8
     - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=openjdk-9
     - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=oracle-jdk-8

java/map.jinja

diff --git a/java/map.jinja b/java/map.jinja
index fe7baca..59c7a23 100644
--- a/java/map.jinja
+++ b/java/map.jinja
@@ -46,7 +46,8 @@
 {%- set java_release = environment.release %}
 {%- set version_name = java_version + '.' + java_release + '+' + java_build %}
 {%- set oracle_file_name = 'jdk-' + java_version + '.' + java_release + '_linux-x64_bin.tar.gz' %}
-{%- set source_url = 'http://download.oracle.com/otn-pub/java/jdk/' + version_name + '/' + oracle_file_name %}
+{%- set oracle_hash = environment.oracle_hash %}
+{%- set source_url = 'http://download.oracle.com/otn-pub/java/jdk/' + version_name + '/' + oracle_hash + '/' + oracle_file_name %}
 {%- endif %}
 {%- set java_real_home = prefix + '/' + version_name %}
 {%- endif %}

tests/pillar/oracle-jdk-9.sls

diff --git a/tests/pillar/oracle-jdk-9.sls b/tests/pillar/oracle-jdk-9.sls
index 9b7135f..a60cc0a 100644
--- a/tests/pillar/oracle-jdk-9.sls
+++ b/tests/pillar/oracle-jdk-9.sls
@@ -2,7 +2,8 @@
   environment:
     enabled: true
     version: '9'
-    release: '0.1'
+    release: '0.4'
     build: '11'
+    oracle_hash: 'c2514751926b4512b076cc82f959763f'
     platform: oracle-java
     development: true