fix tests

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

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