blsmith/dc-deployments-automation
1
0
Fork 0
mirror of https://bitbucket.org/atlassian/dc-deployments-automation.git synced 2025-12-14 00:43:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merged master into CLIP-1583-fix-security-issues

Browse Source
This commit is contained in:
Nasser Ghazali-Beiklar
2022-06-23 03:25:01 +00:00
parent 8349408cf8 30e75a5117
commit 997eaf3a43
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
roles/product_common/tasks/amazon.yml
View File

@@ -1,28 +1,28 @@
--- ---
- name: Add AdoptOpenJDK repo and install if necessary on Amazon Linux - name: Add Adoptium repo and install Eclipse Temurin JDK if necessary on Amazon Linux
block: block:
- name: Add AdoptOpenJDK yum repository - name: Add Adoptium yum repository
yum_repository: yum_repository:
name: AdoptOpenJDK name: Adoptium
file: adoptopenjdk file: adoptium
description: AdoptOpenJDK Repo description: Adoptium Repo
baseurl: "https://adoptopenjdk.jfrog.io/adoptopenjdk/rpm/amazonlinux/{{ ansible_distribution_version }}/{{ ansible_architecture }}/" baseurl: "https://packages.adoptium.net/artifactory/rpm/amazonlinux/{{ ansible_distribution_version }}/{{ ansible_architecture }}"
gpgkey: https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public gpgkey: https://packages.adoptium.net/artifactory/api/gpg/key/public
gpgcheck: yes gpgcheck: yes
state: present state: present
- name: Install AdoptOpenJDK - name: Install Eclipse Temurin JDK
yum: yum:
name: "adoptopenjdk-{{ java_major_version }}-hotspot" name: "temurin-{{ java_major_version }}-jdk"
state: present state: present
- name: Ensure common JDK symlink exists - name: Ensure common JDK symlink exists
alternatives: alternatives:
link: "/usr/lib/jvm/java" link: "/usr/lib/jvm/java"
name: "java_sdk" name: "java_sdk"
path: "/usr/lib/jvm/adoptopenjdk-{{ java_major_version }}-hotspot" path: "/usr/lib/jvm/temurin-{{ java_major_version }}-jdk"
priority: 99 priority: 99
when: atl_use_system_jdk when: atl_use_system_jdk

18
roles/product_common/tasks/ubuntu.yml
View File

@@ -1,6 +1,6 @@
--- ---
- name: Add AdoptOpenJDK repo and install if necessary on Ubuntu - name: Add Adoptium repo and install Eclipse Temurin JDK if necessary on Ubuntu
block: block:
- name: Install gnupg - name: Install gnupg
@@ -8,20 +8,20 @@
name: gnupg name: gnupg
state: present state: present
- name: Add AdoptOpenJDK debian repo public key - name: Add Adoptium debian repo public key
apt_key: apt_key:
url: https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public url: https://packages.adoptium.net/artifactory/api/gpg/key/public
state: present state: present
- name: Add AdoptOpenJDK debian repository - name: Add Adoptium debian repository
apt_repository: apt_repository:
repo: "deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb {{ ansible_distribution_release }} main" repo: "deb https://packages.adoptium.net/artifactory/deb {{ ansible_distribution_release }} main"
state: present state: present
filename: adoptopenjdk filename: adoptium
- name: Install AdoptOpenJDK - name: Install Eclipse Temurin JDK
apt: apt:
name: "adoptopenjdk-{{ java_major_version }}-hotspot" name: "temurin-{{ java_major_version }}-jdk"
update_cache: yes update_cache: yes
state: present state: present
@@ -29,7 +29,7 @@
alternatives: alternatives:
link: "/usr/lib/jvm/java" link: "/usr/lib/jvm/java"
name: "java_sdk" name: "java_sdk"
path: "/usr/lib/jvm/adoptopenjdk-{{ java_major_version }}-hotspot-{{ debian_architecture }}" path: "/usr/lib/jvm/temurin-{{ java_major_version }}-jdk-{{ debian_architecture }}"
priority: 99 priority: 99
when: atl_use_system_jdk when: atl_use_system_jdk