From 74d60e446b95a706a753cc81b94e7556d30120aa Mon Sep 17 00:00:00 2001 From: Alan Cheng Date: Wed, 15 Nov 2023 12:50:33 +1100 Subject: [PATCH 1/2] ITPLT-3381 add alternate adoptium url options for amazon linux 2023 --- roles/product_common/tasks/amazon-2023.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/roles/product_common/tasks/amazon-2023.yml b/roles/product_common/tasks/amazon-2023.yml index 6452f10..5d58078 100644 --- a/roles/product_common/tasks/amazon-2023.yml +++ b/roles/product_common/tasks/amazon-2023.yml @@ -10,8 +10,12 @@ 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 From 4fc84f67285cf0b547403fa40e71511f5ee18175 Mon Sep 17 00:00:00 2001 From: Alan Cheng Date: Wed, 15 Nov 2023 12:59:12 +1100 Subject: [PATCH 2/2] ITPLT-3381 skip idempotence test flag --- roles/product_common/tasks/amazon-2023.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/product_common/tasks/amazon-2023.yml b/roles/product_common/tasks/amazon-2023.yml index 5d58078..865f948 100644 --- a/roles/product_common/tasks/amazon-2023.yml +++ b/roles/product_common/tasks/amazon-2023.yml @@ -18,6 +18,8 @@ - "{{ 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: