Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

unixPB,winPB: install jq on Linux+Windows for SBoM parsing #3460

Merged
merged 1 commit into from
Mar 11, 2024
Merged

unixPB,winPB: install jq on Linux+Windows for SBoM parsing #3460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 #
##############################
Expand Down
7 changes: 6 additions & 1 deletion ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 #
#################
Expand Down
1 change: 1 addition & 0 deletions ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Debian.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Fedora.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ Test_Tool_Packages:
- zlib-devel
- perl-devel
- expat-devel
- jq # For parsing SBoM during reproducibility tests
- libcurl-devel
- mercurial
- gnutls
Expand Down
1 change: 1 addition & 0 deletions ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/SLES.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/Ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/cygwin/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading