From ee8dcbc5e279d4aa09f3b7f9b427502fb59491c7 Mon Sep 17 00:00:00 2001
From: Te-Hung Tseng <te-hung.tseng@esss.se>
Date: Wed, 13 Nov 2019 15:51:07 +0100
Subject: [PATCH] Updated to use adopt openjdk
JIRA INFRA-1494
---
README.md | 4 ++--
defaults/main.yml | 4 ++--
molecule/default/tests/test_default.py | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index 50ba94a..9a5c5ec 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,8 @@ It can also install Oracle JDK 8 in parallel (default is always openjdk) and mav
## Role Variables
```yaml
-java_openjdk_version: "13.0.1"
-java_openjdk_archive: "https://artifactory.esss.lu.se/artifactory/swi-pkg/java/openjdk-{{ java_openjdk_version }}_linux-x64_bin.tar.gz"
+java_openjdk_version: "13.0.1+9"
+java_openjdk_archive: "https://artifactory.esss.lu.se/artifactory/swi-pkg/java/OpenJDK{{ java_openjdk_version | regex_replace('^(\\d+).*', '\\1') }}U-jdk_x64_linux_hotspot_{{ java_openjdk_version | regex_replace('\\+', '_') }}.tar.gz"
java_openjfx_version: "13.0.1"
java_openjfx_archive: "https://artifactory.esss.lu.se/artifactory/swi-pkg/java/openjfx-{{ java_openjfx_version }}_linux-x64_bin-sdk.zip"
diff --git a/defaults/main.yml b/defaults/main.yml
index 8070152..65d9ba7 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,6 +1,6 @@
---
-java_openjdk_version: "13.0.1"
-java_openjdk_archive: "https://artifactory.esss.lu.se/artifactory/swi-pkg/java/openjdk-{{ java_openjdk_version }}_linux-x64_bin.tar.gz"
+java_openjdk_version: "13.0.1+9"
+java_openjdk_archive: "https://artifactory.esss.lu.se/artifactory/swi-pkg/java/OpenJDK{{ java_openjdk_version | regex_replace('^(\\d+).*', '\\1') }}U-jdk_x64_linux_hotspot_{{ java_openjdk_version | regex_replace('\\+', '_') }}.tar.gz"
java_openjfx_version: "13.0.1"
java_openjfx_archive: "https://artifactory.esss.lu.se/artifactory/swi-pkg/java/openjfx-{{ java_openjfx_version }}_linux-x64_bin-sdk.zip"
diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py
index 0fc83be..9f9427f 100644
--- a/molecule/default/tests/test_default.py
+++ b/molecule/default/tests/test_default.py
@@ -6,7 +6,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
).get_hosts("all")
-JAVA_VERSION = "13.0.1"
+JAVA_VERSION = "13.0.1+9"
JAVA_HOME = "/opt/java/jdk-{}".format(JAVA_VERSION)
JAVAFX_VERSION = "13.0.1"
PATH_TO_FX = "/opt/java/javafx-sdk-{}/lib".format(JAVAFX_VERSION)
@@ -19,7 +19,7 @@ def test_java_version(host):
if host.ansible.get_variables()["inventory_hostname"] == "ics-ans-role-java-and-oracle-jdk8":
assert 'java version "1.8.0_{}"'.format(ORACLE_JDK8_VERSION) in cmd.stdout
else:
- assert 'openjdk version "{}"'.format(JAVA_VERSION) in cmd.stdout
+ assert 'build {}'.format(JAVA_VERSION) in cmd.stdout
def test_java_home(host):
--
GitLab