diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml index 99907e2888..079cb95eb0 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml @@ -113,6 +113,12 @@ - ! (ansible_distribution_major_version == "7" and ansible_architecture == "s390x") tags: build_tools +- name: Install jq for SBoM parsing for build reproducibility testing + package: "name=jq state=latest" + when: + - ansible_distribution_major_version > "7" + tags: test_tools + - name: Add devtools-2 to yum repo list for gcc 4.8 get_url: url: https://people.centos.org/tru/devtools-2/devtools-2.repo @@ -190,6 +196,13 @@ - ansible_distribution_major_version == "6" tags: build_tools +- name: Install jq for SBoM parsing for build reproducibility testing + package: "name=jq state=latest" + when: + - ansible_distribution_major_version != "6" + - ansible_distribution_major_version != "7" + tags: test_tools + ############################## # expat on CentOS on x86_64 # ############################## diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml index 46d5691c18..69268ba445 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml @@ -16,7 +16,6 @@ - ansible_architecture == "x86_64" tags: patch_update - - name: Enable EPEL release for RHEL8 or RHEL6 or RHEL7 yum: name=https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm failed_when: false @@ -110,6 +109,12 @@ - (ansible_distribution_major_version == "8") tags: build_tools +- name: Install jq for SBoM parsing for build reproducibility testing + package: "name=jq state=latest" + when: + - ansible_distribution_major_version > "7" + tags: test_tools + ################# # xorg Packages # ################# diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Debian.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Debian.yml index 0da7c701a1..28096f1d24 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Debian.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Debian.yml @@ -104,6 +104,7 @@ Test_Tool_Packages: - binfmt-support - qemu-user-static - gnutls-bin + - jq # For parsing SBoM during reproducibility tests - libnss3 - libnss3-dev - libnss3-tools diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Fedora.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Fedora.yml index f45d1ef322..149ab1d9d9 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Fedora.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Fedora.yml @@ -132,6 +132,7 @@ Test_Tool_Packages: - zlib-devel - perl-devel - expat-devel + - jq # For parsing SBoM during reproducibility tests - libcurl-devel - mercurial - gnutls diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/SLES.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/SLES.yml index ce8127ea30..0d8775b754 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/SLES.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/SLES.yml @@ -98,6 +98,7 @@ Test_Tool_Packages: - xorg-x11-server-extra - glibc-locale # Internationalization tests - gnutls + - jq # For parsing SBoM during reproducibility tests - mozilla-nss - mozilla-nss-devel - mozilla-nss-tools diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Ubuntu.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Ubuntu.yml index 81462d0ccc..b73ce02149 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Ubuntu.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Ubuntu.yml @@ -119,6 +119,7 @@ Test_Tool_Packages: - libexpat1-dev - libcurl4-openssl-dev - fakeroot + - jq # For parsing SBoM during reproducibility tests - gnutls-bin - libnss3 - libnss3-tools diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/cygwin/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/cygwin/tasks/main.yml index fec969b404..443bd11eec 100644 --- a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/cygwin/tasks/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/cygwin/tasks/main.yml @@ -17,7 +17,7 @@ - name: Install Cygwin win_shell: | - Start-Process -Wait -FilePath 'C:\temp\cygwin.exe' -ArgumentList '--packages autoconf,automake,bsdtar,cmake,cpio,curl,gcc-core,git,gnupg,grep,libtool,make,mingw64-x86_64-gcc-core,perl,rsync,unzip,wget,zip --quiet-mode --download --local-install --delete-orphans --site https://mirrors.kernel.org/sourceware/cygwin/ --local-package-dir C:\cygwin_packages --root C:\cygwin64' + Start-Process -Wait -FilePath 'C:\temp\cygwin.exe' -ArgumentList '--packages autoconf,automake,bsdtar,cmake,cpio,curl,gcc-core,git,gnupg,grep,jq,libtool,make,mingw64-x86_64-gcc-core,perl,rsync,unzip,wget,zip --quiet-mode --download --local-install --delete-orphans --site https://mirrors.kernel.org/sourceware/cygwin/ --local-package-dir C:\cygwin_packages --root C:\cygwin64' args: executable: powershell when: not cygwin_installed.stat.exists