From f92484502900d20133688190f886bb49afa2f0d8 Mon Sep 17 00:00:00 2001 From: Alan Cheng Date: Wed, 8 Nov 2023 11:03:05 +1100 Subject: [PATCH] ITPLT-3328 remove hardcoded package.a.c repo, add vars for alt adoptium urls --- roles/product_common/tasks/amazon-2.yml | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/roles/product_common/tasks/amazon-2.yml b/roles/product_common/tasks/amazon-2.yml index 8e22aa4..a384c41 100644 --- a/roles/product_common/tasks/amazon-2.yml +++ b/roles/product_common/tasks/amazon-2.yml @@ -8,22 +8,15 @@ name: Adoptium file: adoptium description: Adoptium Repo - baseurl: "https://packages.adoptium.net/artifactory/rpm/amazonlinux/{{ ansible_distribution_version }}/{{ ansible_architecture }}" - gpgkey: https://packages.adoptium.net/artifactory/api/gpg/key/public + baseurl: + - "https://packages.adoptium.net/artifactory/rpm/amazonlinux/{{ ansible_distribution_version }}/{{ ansible_architecture }}" + - "{{ atl_adoptium_alternate_url is defined | ternary(atl_adoptium_alternate_url, None) }}" + gpgkey: + - https://packages.adoptium.net/artifactory/api/gpg/key/public + - "{{ atl_adoptium_gpgkey_alternate_url is defined | ternary(atl_adoptium_gpgkey_alternate_url, None) }}" gpgcheck: yes state: present - - name: Add Alternate Adoptium yum repository - ansible.builtin.yum_repository: - name: alternate-adoptium - file: alternate-adoptium - description: Alternate Adoptium Repo - baseurl: "https://packages.atlassian.com/artifactory/adoptium-rpm/amazonlinux/{{ ansible_distribution_version }}/{{ ansible_architecture }}" - gpgkey: https://packages.atlassian.com/artifactory/adoptium-rpm/amazonlinux/{{ ansible_distribution_version }}/{{ ansible_architecture }}/repodata/repomd.xml - gpgcheck: true - state: present - ignore_errors: true - - name: Install Eclipse Temurin JDK ansible.builtin.yum: name: "temurin-{{ java_major_version }}-jdk"