From 529df0cafd9c9f912d340c1c2f0f6c47222069a6 Mon Sep 17 00:00:00 2001
From: Lee Goolsbee <lgoolsbee@atlassian.com>
Date: Wed, 26 Aug 2020 16:34:48 -0500
Subject: [PATCH] fix tests

---
 roles/confluence_config/defaults/main.yml       |  2 +-
 .../molecule/default/tests/test_default.py      |  3 +--
 .../molecule/system_jdk/tests/test_default.py   |  3 +--
 roles/confluence_config/tasks/main.yml          |  1 -
 .../molecule/system_jdk/tests/test_default.py   |  3 +--
 roles/product_common/tasks/ubuntu.yml           | 17 ++++++++++++++++-
 6 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/roles/confluence_config/defaults/main.yml b/roles/confluence_config/defaults/main.yml
index e71288d..d39d683 100644
--- a/roles/confluence_config/defaults/main.yml
+++ b/roles/confluence_config/defaults/main.yml
@@ -2,7 +2,7 @@
 
 atl_jvm_heap: "2048m"
 atl_fonts_fallback_dirs:
-    - "{{ atl_java_home }}/lib/fonts/fallback/"
+  - "{{ atl_java_home }}/lib/fonts/fallback/"
 
 atl_autologin_cookie_age: "{{ lookup('env', 'ATL_AUTOLOGIN_COOKIE_AGE') }}"
 
diff --git a/roles/confluence_config/molecule/default/tests/test_default.py b/roles/confluence_config/molecule/default/tests/test_default.py
index d3ff80e..337240b 100644
--- a/roles/confluence_config/molecule/default/tests/test_default.py
+++ b/roles/confluence_config/molecule/default/tests/test_default.py
@@ -81,8 +81,7 @@ def test_confluence_config_file(host):
     assert f.contains('<property name="hibernate.c3p0.preferredTestQuery">select 1;</property>')
 
 @pytest.mark.parametrize('font', [
-#    '/usr/lib/jvm/java/lib/fonts/fallback/NotoSansJavanese-Regular.ttf',
-#    '/usr/lib/jvm/jre/lib/fonts/fallback/NotoSansJavanese-Regular.ttf'
+#    '/usr/lib/jvm/java/lib/fonts/fallback/NotoSansJavanese-Regular.ttf'
     '/opt/atlassian/confluence/current/jre/lib/fonts/fallback/NotoSansJavanese-Regular.ttf'
 ])
 def test_fonts_installed_and_linked(host, font):
diff --git a/roles/confluence_config/molecule/system_jdk/tests/test_default.py b/roles/confluence_config/molecule/system_jdk/tests/test_default.py
index 7cb395e..600b059 100644
--- a/roles/confluence_config/molecule/system_jdk/tests/test_default.py
+++ b/roles/confluence_config/molecule/system_jdk/tests/test_default.py
@@ -12,8 +12,7 @@ def test_seraph_file(host):
     assert f.contains('<param-value>COOKIEAGE</param-value>')
 
 @pytest.mark.parametrize('font', [
-    '/usr/lib/jvm/java/lib/fonts/fallback/NotoSansJavanese-Regular.ttf',
-    '/usr/lib/jvm/jre/lib/fonts/fallback/NotoSansJavanese-Regular.ttf'
+    '/usr/lib/jvm/java/lib/fonts/fallback/NotoSansJavanese-Regular.ttf'
 ])
 def test_fonts_installed_and_linked(host, font):
     f = host.file(font)
diff --git a/roles/confluence_config/tasks/main.yml b/roles/confluence_config/tasks/main.yml
index 07b202c..ea807bb 100644
--- a/roles/confluence_config/tasks/main.yml
+++ b/roles/confluence_config/tasks/main.yml
@@ -52,7 +52,6 @@
     insertafter: "EOF"
     line: 'export CATALINA_OPTS="${CATALINA_OPTS} {{ atl_catalina_opts }} {{ atl_catalina_opts_extra }}"'
 
-
 - name: Configure login properties
   template:
     src: seraph-config.xml.j2
diff --git a/roles/product_common/molecule/system_jdk/tests/test_default.py b/roles/product_common/molecule/system_jdk/tests/test_default.py
index e615c9f..39a5436 100644
--- a/roles/product_common/molecule/system_jdk/tests/test_default.py
+++ b/roles/product_common/molecule/system_jdk/tests/test_default.py
@@ -15,8 +15,7 @@ def test_user_created(host):
 @pytest.mark.parametrize('exe', [
     '/usr/bin/git',
     '/usr/bin/javac',
-    '/usr/lib/jvm/java/bin/java',
-    '/usr/lib/jvm/java/jre/bin/java'
+    '/usr/lib/jvm/java/bin/java'
 ])
 def test_package_exes(host, exe):
     assert host.file(exe).exists
diff --git a/roles/product_common/tasks/ubuntu.yml b/roles/product_common/tasks/ubuntu.yml
index ad2c0dd..dfd8331 100644
--- a/roles/product_common/tasks/ubuntu.yml
+++ b/roles/product_common/tasks/ubuntu.yml
@@ -3,6 +3,21 @@
 - name: Add AdoptOpenJDK repo and install if necessary on Ubuntu
   block:
 
+    - name: Create translation matrix for ansible_architecture values to Ubuntu/Debian nomenclature
+      set_fact:
+        debian_architecture_translations:
+          x86_64: amd64
+          aarch64: arm64
+
+    - name: Set debian_architecture based on ansible_architecture
+      set_fact:
+        debian_architecture: >-
+          {%- if ansible_architecture in debian_architecture_translations -%}
+          {{ debian_architecture_translations[ansible_architecture] }}
+          {%- else -%}
+          {{ ansible_architecture }}
+          {%- endif %}
+
     - name: Install gnupg
       apt:
         name: gnupg
@@ -29,7 +44,7 @@
       alternatives:
         link: "/usr/lib/jvm/java"
         name: "java_sdk"
-        path: "/usr/lib/jvm/adoptopenjdk-{{ java_major_version }}-hotspot"
+        path: "/usr/lib/jvm/adoptopenjdk-{{ java_major_version }}-hotspot-{{ debian_architecture }}"
         priority: 99
 
   when: atl_use_system_jdk