From b7212f9d92d509d684ca47d6d4930294734d4173 Mon Sep 17 00:00:00 2001 From: Scott Fryer Date: Tue, 11 Feb 2025 09:33:13 +0000 Subject: [PATCH 1/5] UnixPB: Fix Problematic Centos6 Downloads --- .../roles/GIT_Source/tasks/main.yml | 19 +++++++++++++++ .../roles/NVidia_Cuda_Toolkit/tasks/main.yml | 24 +++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/GIT_Source/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/GIT_Source/tasks/main.yml index b5531eb382..0627715b53 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/GIT_Source/tasks/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/GIT_Source/tasks/main.yml @@ -41,6 +41,25 @@ when: - (git_installed.rc != 0 ) or (git_installed.rc == 0 and git_version.stdout is version_compare('2.15', operator='lt')) - ansible_distribution != "FreeBSD" + - ansible_distribution != "CentOS" or ansible_distribution_major_version | int != 6 + tags: git_source + +- name: Download git source for CentOS 6 + shell: "wget -q -O /tmp/git-2.15.0.tar.xz https://www.kernel.org/pub/software/scm/git/git-2.15.0.tar.xz" + args: + warn: false + when: + - (git_installed.rc != 0 ) or (git_installed.rc == 0 and git_version.stdout is version_compare('2.15', operator='lt')) + - ansible_distribution == "CentOS" and ansible_distribution_major_version | int == 6 + tags: git_source + +- name: Verify checksum for CentOS 6 Git Source download ... + shell: sha256sum /tmp/git-2.15.0.tar.xz + register: checksum_result + failed_when: "'107116489f10b758b51af1c5dbdb9a274917b0fb67dc8eaefcdabc7bc3eb3e6a' not in checksum_result.stdout" + when: + - (git_installed.rc != 0 ) or (git_installed.rc == 0 and git_version.stdout is version_compare('2.15', operator='lt')) + - ansible_distribution == "CentOS" and ansible_distribution_major_version | int == 6 tags: git_source - name: Extract git source diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/NVidia_Cuda_Toolkit/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/NVidia_Cuda_Toolkit/tasks/main.yml index a3202e9e20..8e02f92c5a 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/NVidia_Cuda_Toolkit/tasks/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/NVidia_Cuda_Toolkit/tasks/main.yml @@ -2,6 +2,7 @@ ####################### # NVidia_Cuda_Toolkit # ####################### + - name: Check if NVidia CUDA toolkit is already installed stat: path: /usr/local/cuda-9.0 @@ -21,6 +22,29 @@ - cuda_installed.stat.isdir is not defined - (ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "16") or (ansible_distribution == "RedHat" and (ansible_distribution_major_version == "6" or ansible_distribution_major_version == "7")) or (ansible_distribution == "CentOS" and (ansible_distribution_major_version == "6" or ansible_distribution_major_version == "7")) - (ansible_architecture == "x86_64" or ansible_architecture == "ppc64le") + - ansible_distribution != "CentOS" or ansible_distribution_major_version | int != 6 + tags: nvidia_cuda_toolkit + +- name: Download Nvidia Cuda for CentOS 6 + shell: "wget -q -O /tmp/cuda9_linux-run https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run" + args: + warn: false + when: + - cuda_installed.stat.isdir is not defined + - (ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "16") or (ansible_distribution == "RedHat" and (ansible_distribution_major_version == "6" or ansible_distribution_major_version == "7")) or (ansible_distribution == "CentOS" and (ansible_distribution_major_version == "6" or ansible_distribution_major_version == "7")) + - (ansible_architecture == "x86_64" or ansible_architecture == "ppc64le") + - ansible_distribution == "CentOS" and ansible_distribution_major_version | int == 6 + tags: nvidia_cuda_toolkit + +- name: Verify checksum for CentOS 6 Nvdia Cuda download ... + shell: sha256sum /tmp/cuda9_linux-run + register: checksum_result + failed_when: "'96863423feaa50b5c1c5e1b9ec537ef7ba77576a3986652351ae43e66bcd080c' not in checksum_result.stdout" + when: + - cuda_installed.stat.isdir is not defined + - (ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "16") or (ansible_distribution == "RedHat" and (ansible_distribution_major_version == "6" or ansible_distribution_major_version == "7")) or (ansible_distribution == "CentOS" and (ansible_distribution_major_version == "6" or ansible_distribution_major_version == "7")) + - (ansible_architecture == "x86_64" or ansible_architecture == "ppc64le") + - ansible_distribution == "CentOS" and ansible_distribution_major_version | int == 6 tags: nvidia_cuda_toolkit - name: Install NVidia CUDA toolkit From c0fdf3dc1b693a11aa3243776169389379ba5ebd Mon Sep 17 00:00:00 2001 From: Scott Fryer Date: Wed, 12 Feb 2025 16:06:03 +0000 Subject: [PATCH 2/5] VPC: Fix BUILD_ARGS setting in build test. --- ansible/pbTestScripts/buildJDK.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/pbTestScripts/buildJDK.sh b/ansible/pbTestScripts/buildJDK.sh index 5eb3c4a1b6..ea1695b2e0 100755 --- a/ansible/pbTestScripts/buildJDK.sh +++ b/ansible/pbTestScripts/buildJDK.sh @@ -191,5 +191,5 @@ echo "buildJDK.sh DEBUG: cloneRepo cd $WORKSPACE/openjdk-build -export BUILD_ARGS=--create-sbom +export BUILD_ARGS+=" --create-sbom" build-farm/make-adopt-build-farm.sh From b2c27a065ece0e5045238b5eb8abc7588d78900c Mon Sep 17 00:00:00 2001 From: Scott Fryer <60462088+steelhead31@users.noreply.github.com> Date: Fri, 14 Feb 2025 11:12:00 +0000 Subject: [PATCH 3/5] Update ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/GIT_Source/tasks/main.yml Co-authored-by: Stewart X Addison <6487691+sxa@users.noreply.github.com> --- .../AdoptOpenJDK_Unix_Playbook/roles/GIT_Source/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/GIT_Source/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/GIT_Source/tasks/main.yml index 0627715b53..db547b214e 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/GIT_Source/tasks/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/GIT_Source/tasks/main.yml @@ -53,7 +53,7 @@ - ansible_distribution == "CentOS" and ansible_distribution_major_version | int == 6 tags: git_source -- name: Verify checksum for CentOS 6 Git Source download ... +- name: Verify checksum for CentOS 6 Git Source download ... shell: sha256sum /tmp/git-2.15.0.tar.xz register: checksum_result failed_when: "'107116489f10b758b51af1c5dbdb9a274917b0fb67dc8eaefcdabc7bc3eb3e6a' not in checksum_result.stdout" From 0cff0aa41de93f27b2f0c6dbb7fac97a1ef95f79 Mon Sep 17 00:00:00 2001 From: Scott Fryer Date: Fri, 14 Feb 2025 11:15:29 +0000 Subject: [PATCH 4/5] VPC: Improve handling of build_args in buildjdk test --- ansible/pbTestScripts/buildJDK.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ansible/pbTestScripts/buildJDK.sh b/ansible/pbTestScripts/buildJDK.sh index ea1695b2e0..f665c9e528 100755 --- a/ansible/pbTestScripts/buildJDK.sh +++ b/ansible/pbTestScripts/buildJDK.sh @@ -169,11 +169,11 @@ fi # Don't build the debug-images as it takes too much space, and doesn't benefit VPC # See: https://github.com/adoptium/infrastructure/issues/2033 export CONFIGURE_ARGS="--with-native-debug-symbols=none" -export BUILD_ARGS="--custom-cacerts false" +export BUILD_ARGS="--custom-cacerts false --create-sbom" # For Ubuntu24.04 Support - Don't Use gcc-7 if grep 'noble' /etc/*-release >/dev/null 2>&1; then - export BUILD_ARGS="--custom-cacerts false --use-adoptium-devkit gcc-11.3.0-Centos7.9.2009-b03" + export BUILD_ARGS="${BUILD_ARGS} --use-adoptium-devkit gcc-11.3.0-Centos7.9.2009-b03" fi echo "buildJDK.sh DEBUG: @@ -191,5 +191,4 @@ echo "buildJDK.sh DEBUG: cloneRepo cd $WORKSPACE/openjdk-build -export BUILD_ARGS+=" --create-sbom" build-farm/make-adopt-build-farm.sh From ed6d03cf732504baedaec854acad19f785c75c95 Mon Sep 17 00:00:00 2001 From: Scott Fryer Date: Fri, 14 Feb 2025 11:29:34 +0000 Subject: [PATCH 5/5] UnixPB: Add RHEL clause to git download method Revert "UnixPB: Add RHEL clause to git download method" This reverts commit 82190f1a5b6174bca2c37251fe37759f8aa7d890. UnixPB: Add RHEL6 clause for Git_Source Download --- .../roles/GIT_Source/tasks/main.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/GIT_Source/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/GIT_Source/tasks/main.yml index db547b214e..244ac1e837 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/GIT_Source/tasks/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/GIT_Source/tasks/main.yml @@ -42,6 +42,7 @@ - (git_installed.rc != 0 ) or (git_installed.rc == 0 and git_version.stdout is version_compare('2.15', operator='lt')) - ansible_distribution != "FreeBSD" - ansible_distribution != "CentOS" or ansible_distribution_major_version | int != 6 + - ansible_distribution != "RedHat" or ansible_distribution_major_version | int != 6 tags: git_source - name: Download git source for CentOS 6 @@ -50,7 +51,8 @@ warn: false when: - (git_installed.rc != 0 ) or (git_installed.rc == 0 and git_version.stdout is version_compare('2.15', operator='lt')) - - ansible_distribution == "CentOS" and ansible_distribution_major_version | int == 6 + - (ansible_distribution == "CentOS" or ansible_distribution == "RedHat") + - ansible_distribution_major_version | int == 6 tags: git_source - name: Verify checksum for CentOS 6 Git Source download ... @@ -59,7 +61,8 @@ failed_when: "'107116489f10b758b51af1c5dbdb9a274917b0fb67dc8eaefcdabc7bc3eb3e6a' not in checksum_result.stdout" when: - (git_installed.rc != 0 ) or (git_installed.rc == 0 and git_version.stdout is version_compare('2.15', operator='lt')) - - ansible_distribution == "CentOS" and ansible_distribution_major_version | int == 6 + - (ansible_distribution == "CentOS" or ansible_distribution == "RedHat") + - ansible_distribution_major_version | int == 6 tags: git_source - name: Extract git source