mirror of
https://bitbucket.org/atlassian/dc-deployments-automation.git
synced 2025-12-14 08:53:07 -06:00
DCD-1020: Use the major java version and let per-OS roles apply the approriate naming.
This commit is contained in:
@@ -9,7 +9,7 @@
|
|||||||
#
|
#
|
||||||
# https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html
|
# https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html
|
||||||
|
|
||||||
java_version: "1.8.0"
|
java_major_version: "8"
|
||||||
postgres_version: "9.6"
|
postgres_version: "9.6"
|
||||||
git_version: "2.14.4"
|
git_version: "2.14.4"
|
||||||
atl_shared_mountpoint: "/media/atl"
|
atl_shared_mountpoint: "/media/atl"
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
---
|
---
|
||||||
java_version: "1.8.0"
|
|
||||||
java_major_version: "8"
|
java_major_version: "8"
|
||||||
postgres_version: "9.6"
|
postgres_version: "9.6"
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,9 @@ def test_user_created(host):
|
|||||||
|
|
||||||
@pytest.mark.parametrize('exe', [
|
@pytest.mark.parametrize('exe', [
|
||||||
'/usr/bin/git',
|
'/usr/bin/git',
|
||||||
'/usr/bin/javac'
|
'/usr/bin/javac',
|
||||||
|
'/usr/lib/jvm/java/bin/java',
|
||||||
|
'/usr/lib/jvm/java/jre/bin/java'
|
||||||
])
|
])
|
||||||
def test_package_exes(host, exe):
|
def test_package_exes(host, exe):
|
||||||
assert host.file(exe).exists
|
assert host.file(exe).exists
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
- name: Install JDK if necessary on Amazon Linux
|
- name: Install JDK if necessary on Amazon Linux
|
||||||
yum:
|
yum:
|
||||||
name:
|
name:
|
||||||
- java-{{ java_version }}-openjdk-devel
|
- java-1.{{ java_major_version }}.0-openjdk-devel
|
||||||
when: atl_use_system_jdk
|
when: atl_use_system_jdk
|
||||||
|
|
||||||
- name: Install other base packages on Amazon Linux
|
- name: Install other base packages on Amazon Linux
|
||||||
|
|||||||
Reference in New Issue
Block a user