From 1d98b913a5eea283a915e532c2d99b35fb3b6abe Mon Sep 17 00:00:00 2001 From: Alan Cheng Date: Tue, 7 Nov 2023 15:36:31 +1100 Subject: [PATCH 1/5] ITPLT-3328 add packages.a.c alternate adoptium repo --- roles/product_common/tasks/amazon-2.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/roles/product_common/tasks/amazon-2.yml b/roles/product_common/tasks/amazon-2.yml index 7538d97..8e22aa4 100644 --- a/roles/product_common/tasks/amazon-2.yml +++ b/roles/product_common/tasks/amazon-2.yml @@ -13,6 +13,17 @@ 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" From f92484502900d20133688190f886bb49afa2f0d8 Mon Sep 17 00:00:00 2001 From: Alan Cheng Date: Wed, 8 Nov 2023 11:03:05 +1100 Subject: [PATCH 2/5] 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" From 33bd02b06057e0ab3dc59a6303c72ef299576d5c Mon Sep 17 00:00:00 2001 From: Alan Cheng Date: Wed, 8 Nov 2023 11:22:15 +1100 Subject: [PATCH 3/5] ITPLT-3328 pipeline test --- roles/product_common/tasks/amazon-2.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/product_common/tasks/amazon-2.yml b/roles/product_common/tasks/amazon-2.yml index a384c41..1eee479 100644 --- a/roles/product_common/tasks/amazon-2.yml +++ b/roles/product_common/tasks/amazon-2.yml @@ -10,10 +10,10 @@ description: Adoptium Repo 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) }}" + - "https://packages.atlassian.com/artifactory/adoptium-rpm/amazonlinux/2/x86_64" gpgkey: - https://packages.adoptium.net/artifactory/api/gpg/key/public - - "{{ atl_adoptium_gpgkey_alternate_url is defined | ternary(atl_adoptium_gpgkey_alternate_url, None) }}" + - "https://packages.atlassian.com/artifactory/adoptium-rpm/amazonlinux/2/x86_64/repodata/repomd.xml.key" gpgcheck: yes state: present From bf479353afbc4e300cef4c115ba4ce64952ed332 Mon Sep 17 00:00:00 2001 From: Alan Cheng Date: Wed, 8 Nov 2023 11:38:10 +1100 Subject: [PATCH 4/5] Revert "ITPLT-3328 pipeline test" This reverts commit 33bd02b06057e0ab3dc59a6303c72ef299576d5c. --- roles/product_common/tasks/amazon-2.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/product_common/tasks/amazon-2.yml b/roles/product_common/tasks/amazon-2.yml index 1eee479..a384c41 100644 --- a/roles/product_common/tasks/amazon-2.yml +++ b/roles/product_common/tasks/amazon-2.yml @@ -10,10 +10,10 @@ 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, None) }}" 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, None) }}" gpgcheck: yes state: present From 1647b70ca842c5f5887a6e1ab1fe7f33216cb16f Mon Sep 17 00:00:00 2001 From: Alan Cheng Date: Wed, 8 Nov 2023 11:47:27 +1100 Subject: [PATCH 5/5] ITPLT-3328 try pass idempotence test --- roles/product_common/tasks/amazon-2.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/product_common/tasks/amazon-2.yml b/roles/product_common/tasks/amazon-2.yml index a384c41..4cf0472 100644 --- a/roles/product_common/tasks/amazon-2.yml +++ b/roles/product_common/tasks/amazon-2.yml @@ -10,10 +10,10 @@ description: Adoptium Repo 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) }}" + - "{{ 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, None) }}" + - "{{ atl_adoptium_gpgkey_alternate_url is defined | ternary(atl_adoptium_gpgkey_alternate_url, '') }}" gpgcheck: yes state: present