From 49b81295beba61000a70b9869e4d22d1033c5bdc Mon Sep 17 00:00:00 2001
From: Scott Fryer <60462088+steelhead31@users.noreply.github.com>
Date: Wed, 1 Nov 2023 08:33:09 +0000
Subject: [PATCH] UnixPB: Only install ssl test packages on x64 for Centos/RHEL
 (#3226)

* Remove ssl test packages.

* Move SSL Test Packages To Only Install on x64
---
 .../AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml | 6 ++----
 .../AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml | 3 +--
 .../roles/DockerStatic/Dockerfiles/Dockerfile.cent8         | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml
index e885ba7b4f..0cf836bab6 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml
@@ -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
@@ -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
@@ -113,7 +113,5 @@ Test_Tool_Packages:
   - fakeroot
   - gnutls
   - gnutls-utils
-  - libnss3.so
-  - libnssutil3.so
   - nss-devel
   - nss-tools
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml
index 6db7764e38..04a84fd26a 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml
@@ -31,7 +31,6 @@ Build_Tool_Packages:
   - gmp-devel
   - libcurl-devel
   - libffi-devel
-  - libnss3.so
   - libpng-devel
   - libXext-devel
   - libXi-devel                   # JDK12+ compilation
@@ -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
@@ -114,6 +114,5 @@ Test_Tool_Packages:
   - mercurial
   - gnutls
   - gnutls-utils
-  - libnss3.so
   - nss-devel
   - nss-tools
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.cent8 b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.cent8
index 42b4d51375..1ac9c9ec20 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.cent8
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.cent8
@@ -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