Formulas testing revision 2019/10
- Update JDK 11 to JDK 13 since only last version
is free to download from Oracle page
Related: PROD-32744
Related: PROD-33698
Change-Id: Id391cb4730bf0cbaf73d9623381837d8a990724b
diff --git a/.kitchen.yml b/.kitchen.yml
index b5b641b..d32f93e 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -29,8 +29,7 @@
sudo: true
docker_images:
- - &xenial-20177 <%=ENV['IMAGE_XENIAL_20177'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-2017.7/salt:2018_11_19'%>
- - &xenial-stable <%=ENV['IMAGE_XENIAL_STABLE'] || 'docker-dev-local.docker.mirantis.net/epcim/salt/saltstack-ubuntu-xenial-salt-stable/salt:2018_11_19'%>
+ - &xenial-20177 <%=ENV['IMAGE_XENIAL_20177'] || 'docker-dev-local.docker.mirantis.net/mirantis/drivetrain/salt-formulas-ci/salt-formulas-ci-xenial-2017.7:latest'%>
platforms:
- name: xenial-2017.7
@@ -38,11 +37,6 @@
image: *xenial-20177
platform: ubuntu
- - name: xenial-stable
- driver_config:
- image: *xenial-stable
- platform: ubuntu
-
suites:
- name: openjdk-9
provisioner:
@@ -54,8 +48,8 @@
pillars-from-files:
java.sls: tests/pillar/openjdk-10.sls
- - name: oracle-jdk-11
+ - name: oracle-jdk-13
provisioner:
pillars-from-files:
- java.sls: tests/pillar/oracle-jdk-11.sls
+ java.sls: tests/pillar/oracle-jdk-13.sls
# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
\ No newline at end of file
diff --git a/java/map.jinja b/java/map.jinja
index 7727648..6d56c2f 100644
--- a/java/map.jinja
+++ b/java/map.jinja
@@ -37,7 +37,7 @@
{%- set prefix = '/usr/share/java' %}
{%- set oracle_cookie = 'Cookie: oraclelicense=accept-securebackup-cookie' %}
{%- set dl_opts = '-LOH' %}
- {%- if (java_version == '11') %}
+ {%- if (java_version|int > 9) %}
{%- set java_build = environment.build %}
{%- set java_release = environment.release %}
{%- set version_name = java_version + '.' + java_release + '+' + java_build %}
diff --git a/tests/pillar/oracle-jdk-11.sls b/tests/pillar/oracle-jdk-11.sls
deleted file mode 100644
index fbcb12e..0000000
--- a/tests/pillar/oracle-jdk-11.sls
+++ /dev/null
@@ -1,9 +0,0 @@
-java:
- environment:
- enabled: true
- version: '11'
- release: '0.1'
- build: '13'
- oracle_hash: '90cf5d8f270a4347a95050320eef3fb7'
- platform: oracle-java
- development: true
diff --git a/tests/pillar/oracle-jdk-13.sls b/tests/pillar/oracle-jdk-13.sls
new file mode 100644
index 0000000..a0b1319
--- /dev/null
+++ b/tests/pillar/oracle-jdk-13.sls
@@ -0,0 +1,9 @@
+java:
+ environment:
+ enabled: true
+ version: '13'
+ release: '0.1'
+ build: '9'
+ oracle_hash: 'cec27d702aa74d5a8630c65ae61e4305'
+ platform: oracle-java
+ development: true