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

ITPLT-3356 Merge master - merge conflict fix

Browse Source
This commit is contained in:
Glenn Stewart
2024-02-07 16:41:07 +11:00
parent 7eeff3e8af 91bad32ba0
commit b6df933e36
5 changed files with 94 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/product_common/tasks/amazon-2.yml
View File

@@ -10,12 +10,14 @@
description: Adoptium Repo
baseurl:
- "https://packages.adoptium.net/artifactory/rpm/amazonlinux/{{ ansible_distribution_version }}/{{ ansible_architecture }}"
- "https://packages.atlassian.com/artifactory/adoptium-rpm/amazonlinux/2/x86_64"
- "{{ atl_adoptium_alternate_url is defined | ternary(atl_adoptium_alternate_url, '') }}"
gpgkey:
- https://packages.adoptium.net/artifactory/api/gpg/key/public
- https://packages.atlassian.com/artifactory/adoptium-rpm/amazonlinux/2/x86_64/repodata/repomd.xml.key
- "{{ atl_adoptium_gpgkey_alternate_url is defined | ternary(atl_adoptium_gpgkey_alternate_url, '') }}"
gpgcheck: yes
state: present
tags:
- molecule-idempotence-notest
- name: Install Eclipse Temurin JDK
ansible.builtin.yum:

10
roles/product_common/tasks/amazon-2023.yml
View File

@@ -10,10 +10,16 @@
name: Adoptium
file: adoptium
description: Adoptium Repo
baseurl: "https://packages.adoptium.net/artifactory/rpm/fedora/36/{{ ansible_architecture }}"
gpgkey: https://packages.adoptium.net/artifactory/api/gpg/key/public
baseurl:
- "https://packages.adoptium.net/artifactory/rpm/fedora/36/{{ ansible_architecture }}"
- "{{ atl_adoptium_alternate_url is defined | ternary(atl_adoptium_alternate_url, '') }}"
gpgkey:
- https://packages.adoptium.net/artifactory/api/gpg/key/public
- "{{ atl_adoptium_gpgkey_alternate_url is defined | ternary(atl_adoptium_gpgkey_alternate_url, '') }}"
gpgcheck: yes
state: present
tags:
- molecule-idempotence-notest
- name: Install Eclipse Temurin JDK
ansible.builtin.yum: