fix tests

This commit is contained in:
Lee Goolsbee
2020-08-26 16:34:48 -05:00
parent 45c2d01b17
commit 529df0cafd
6 changed files with 20 additions and 9 deletions

View File

@@ -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