From 2ab6da34fccf94e3b454dcc63934d5eba25ae8dd Mon Sep 17 00:00:00 2001 From: Alan Cheng Date: Tue, 7 Nov 2023 15:36:31 +1100 Subject: [PATCH 1/9] 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 9ffe858a80a344603fb8ea044b6390052984c906 Mon Sep 17 00:00:00 2001 From: Alan Cheng Date: Wed, 8 Nov 2023 11:03:05 +1100 Subject: [PATCH 2/9] 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 9cef32d7504300089bea4fb7a2693099a3f9f823 Mon Sep 17 00:00:00 2001 From: Alan Cheng Date: Wed, 8 Nov 2023 11:22:15 +1100 Subject: [PATCH 3/9] 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 1c233e821324e87e9ea757c66b59172df5ca2d81 Mon Sep 17 00:00:00 2001 From: Alan Cheng Date: Wed, 8 Nov 2023 11:38:10 +1100 Subject: [PATCH 4/9] 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 3b5c5517a5d000290607fc097a19e2c59b19cfab Mon Sep 17 00:00:00 2001 From: Alan Cheng Date: Wed, 8 Nov 2023 11:47:27 +1100 Subject: [PATCH 5/9] 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 From 156c1daf7bc25ccfd60145fb0fef895ed8e2d6de Mon Sep 17 00:00:00 2001 From: Alan Cheng Date: Wed, 8 Nov 2023 14:04:50 +1100 Subject: [PATCH 6/9] ITPLT-3328 try fix idempotency pipeline error --- roles/product_common/tasks/amazon-2.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/roles/product_common/tasks/amazon-2.yml b/roles/product_common/tasks/amazon-2.yml index 4cf0472..b9d82bf 100644 --- a/roles/product_common/tasks/amazon-2.yml +++ b/roles/product_common/tasks/amazon-2.yml @@ -10,10 +10,9 @@ 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, '') }}" + - "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, '') }}" gpgcheck: yes state: present From eaf04584d640462fd9c84a86e749ffb135ec6145 Mon Sep 17 00:00:00 2001 From: Alan Cheng Date: Thu, 9 Nov 2023 11:23:45 +1100 Subject: [PATCH 7/9] Revert "ITPLT-3328 try fix idempotency pipeline error" This reverts commit 156c1daf7bc25ccfd60145fb0fef895ed8e2d6de. --- roles/product_common/tasks/amazon-2.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/product_common/tasks/amazon-2.yml b/roles/product_common/tasks/amazon-2.yml index b9d82bf..4cf0472 100644 --- a/roles/product_common/tasks/amazon-2.yml +++ b/roles/product_common/tasks/amazon-2.yml @@ -10,9 +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, '') }}" 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 6573647df5324afea6dab865dca89b456caa810a Mon Sep 17 00:00:00 2001 From: Alan Cheng Date: Thu, 9 Nov 2023 11:25:49 +1100 Subject: [PATCH 8/9] ITPLT-3328 add notest tag --- roles/product_common/tasks/amazon-2.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/product_common/tasks/amazon-2.yml b/roles/product_common/tasks/amazon-2.yml index 4cf0472..7b1213f 100644 --- a/roles/product_common/tasks/amazon-2.yml +++ b/roles/product_common/tasks/amazon-2.yml @@ -16,6 +16,8 @@ - "{{ atl_adoptium_gpgkey_alternate_url is defined | ternary(atl_adoptium_gpgkey_alternate_url, '') }}" gpgcheck: yes state: present + tags: + - notest - name: Install Eclipse Temurin JDK ansible.builtin.yum: From dc4156d23868eaf2ed82e0797398c83acc277060 Mon Sep 17 00:00:00 2001 From: Alan Cheng Date: Thu, 9 Nov 2023 11:43:14 +1100 Subject: [PATCH 9/9] ITPLT-3328 try molecule idempotence skip tag --- roles/product_common/tasks/amazon-2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/product_common/tasks/amazon-2.yml b/roles/product_common/tasks/amazon-2.yml index 7b1213f..240bfdb 100644 --- a/roles/product_common/tasks/amazon-2.yml +++ b/roles/product_common/tasks/amazon-2.yml @@ -17,7 +17,7 @@ gpgcheck: yes state: present tags: - - notest + - molecule-idempotence-notest - name: Install Eclipse Temurin JDK ansible.builtin.yum: