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

UnixPB: Only install ssl test packages on x64 for Centos/RHEL #3226

Merged
merged 2 commits into from
Nov 1, 2023
Merged

UnixPB: Only install ssl test packages on x64 for Centos/RHEL #3226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a8814d
Remove ssl test packages.
steelhead31 Oct 18, 2023
358b6a9
Move SSL Test Packages To Only Install on x64
steelhead31 Oct 30, 2023
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
6 changes: 2 additions & 4 deletions ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ Build_Tool_Packages:
- gnutls-utils
- java-1.8.0-openjdk-devel
- libcurl-devel
- libnss3.so
- libnssutil3.so
- libpng-devel
- libXext-devel
- libXi-devel # JDK12+ compilation
Expand Down Expand Up @@ -89,6 +87,8 @@ Additional_Build_Tools_CentOS_x86:
- glibc.i686 # a dependency required for executing a 32-bit C binary
- glibc-devel.i686 # a dependency required for executing a 32-bit C binary
- libstdc++.i686 # a dependency required for executing a 32-bit C binary
- libnss3.so
- libnssutil3.so

Additional_Build_Tools_CentOS8_Stream:
- libdwarf
Expand All @@ -113,7 +113,5 @@ Test_Tool_Packages:
- fakeroot
- gnutls
- gnutls-utils
- libnss3.so
- libnssutil3.so
- nss-devel
- nss-tools
3 changes: 1 addition & 2 deletions ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ Build_Tool_Packages:
- gmp-devel
- libcurl-devel
- libffi-devel
- libnss3.so
- libpng-devel
- libXext-devel
- libXi-devel # JDK12+ compilation
Expand Down Expand Up @@ -77,6 +76,7 @@ Additional_Build_Tools_RHEL_x86:
- glibc.i686 # a dependency required for executing a 32-bit C binary
- glibc-devel.i686 # a dependency required for executing a 32-bit C binary
- libstdc++.i686 # a dependency required for executing a 32-bit C binary
- libnss3.so

Additional_Build_Tools_RHEL_ppc64:
- glibc.ppc # a dependency required for executing a 32-bit C binary
Expand Down Expand Up @@ -114,6 +114,5 @@ Test_Tool_Packages:
- mercurial
- gnutls
- gnutls-utils
- libnss3.so
- nss-devel
- nss-tools
2 changes: 1 addition & 1 deletion ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.cent8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|

RUN dnf -y update && dnf install -y perl openssh-server unzip zip wget epel-release
# Install OpenSSL Packages
RUN dnf install -y gnutls gnutls-utils libnss3.so libnssutil3.so nss-devel nss-tools
RUN dnf install -y gnutls gnutls-utils nss-devel nss-tools
RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -P ""
# Get latest jdk17 ga
RUN wget -q 'https://api.adoptium.net/v3/binary/latest/17/ga/linux/x64/jdk/hotspot/normal/eclipse?project=jdk' -O /tmp/jdk17.tar.gz
Expand Down
Loading