UnixPb: Use wget to download ant-contrib on centos6 (#2488)

* use wget to download ant-contrib on centos6 * add issue ref * install ca-certificates before ant-contrib role
adoptium · Mar 2, 2022 · c6ef80e · c6ef80e
1 parent d622d65
commit c6ef80e
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 0 deletions.
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Ant-Contrib/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Ant-Contrib/tasks/main.yml
@@ -41,6 +41,32 @@
     - not antcontrib_status.stat.exists
     - ansible_distribution != "MacOSX"
     - ansible_distribution != "Solaris"
+    - not (ansible_distribution == "CentOS" and ansible_distribution_major_version == "6")
+  tags: ant-contrib
+
+# Use wget instead of ansible's get_url for Centos 6 https://github.com/adoptium/infrastructure/issues/2486
+
+- name: Download ant-contrib (CentOS 6)
+  command: wget https://sourceforge.net/projects/ant-contrib/files/ant-contrib/ant-contrib-{{ antContribVersion }}/ant-contrib-{{ antContribVersion }}-bin.tar.gz -O /tmp/ant-contrib-{{ antContribVersion }}-bin.tar.gz
+  retries: 3
+  delay: 5
+  register: antContrib_download
+  until: antContrib_download is not failed
+  when:
+    - not antcontrib_status.stat.exists
+    - ansible_distribution == "CentOS" and ansible_distribution_major_version == "6"
+  tags: ant-contrib
+
+- name: Verify sha256 checksum of download (CentOS 6)
+  stat:
+    path: /tmp/ant-contrib-{{ antContribVersion }}-bin.tar.gz
+    checksum_algorithm: sha256
+    get_checksum: yes
+  register: antcontrib_checksum
+  failed_when: antcontrib_checksum.stat.checksum != 'c9b8b1ca18b13e293688cafbd8990c940ca49104dbeefc242e5c3f8de271abdf'
+  when:
+    - not antcontrib_status.stat.exists
+    - ansible_distribution == "CentOS" and ansible_distribution_major_version == "6"
   tags: ant-contrib
 
 - name: Download ant-contrib (macOS) and (Solaris)

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml
@@ -10,6 +10,7 @@ Build_Tool_Packages:
   - bind-utils
   - bison                         # OpenJ9
   - bzip2
+  - ca-certificates
   - cpio
   - curl
   - cups-devel

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Debian.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Debian.yml
@@ -11,6 +11,7 @@ Build_Tool_Packages:
   - build-essential
   - cpio
   - curl
+  - ca-certificates
   - flex                          # OpenJ9
   - g++
   - gcc

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml
@@ -10,6 +10,7 @@ Build_Tool_Packages:
   - bind-utils
   - bison                         # OpenJ9
   - bzip2
+  - ca-certificates
   - cpio
   - curl
   - cups-devel

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Ubuntu.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Ubuntu.yml
@@ -9,6 +9,7 @@ Build_Tool_Packages:
   - autoconf
   - bison                         # OpenJ9
   - build-essential
+  - ca-certificates
   - cpio
   - curl
   - flex                          # Openj9
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,7 @@ Build_Tool_Packages: @@
       - build-essential
       - cpio
       - curl
+      - ca-certificates
       - flex                          # OpenJ9
       - g++
       - gcc
@@ Expand Down @@