Merge pull request #19996 from pshipton/build0.47

(0.47) Backport docker build support for x and p linux for jdk23

Author: AdamBrousseau

buildenv/jenkins/common/build.groovy

@@ -814,12 +814,41 @@ def _build_all() {
     }
 }
 
+// TODO: remove this workaround when https://github.com/adoptium/infrastructure/issues/3597 resolved. related: infra 9292
+def create_docker_image_locally()
+{
+    new_image_name=DOCKER_IMAGE.split(':')[0]+'_cuda'
+    sh '''
+        echo 'ARG image
+            ARG cuda_ver=12.2.0
+            ARG cuda_distro=ubi8
+            FROM nvidia/cuda:${cuda_ver}-devel-${cuda_distro} as cuda
+            FROM $image
+            RUN mkdir -p /usr/local/cuda/nvvm
+            COPY --from=cuda /usr/local/cuda/include         /usr/local/cuda/include
+            COPY --from=cuda /usr/local/cuda/nvvm/include    /usr/local/cuda/nvvm/include
+            ENV CUDA_HOME="/usr/local/cuda"' > dockerFile
+    '''
+    println "Preparing Docker image ${new_image_name} locally ..."
+    dockerRegistry = getDockerRegistry(DOCKER_IMAGE)
+    dockerCredentialID = variableFile.get_user_credentials_id(dockerRegistry.replaceAll('https://','') ?: 'dockerhub')
+    docker.withRegistry(dockerRegistry, "${dockerCredentialID}") {
+            docker.build(new_image_name, "--build-arg image=${DOCKER_IMAGE} -f dockerFile .")
+    }
+    DOCKER_IMAGE = new_image_name
+}
+
 def build_all() {
     stage ('Queue') {
         timeout(time: 10, unit: 'HOURS') {
             node("${NODE}") {
                 timeout(time: 5, unit: 'HOURS') {
                     if ("${DOCKER_IMAGE}") {
+                        // TODO: remove this workaround when https://github.com/adoptium/infrastructure/issues/3597 resolved. related: infra 9292
+                        if ((PLATFORM ==~ /ppc64le_linux.*/) ||
+                            ((PLATFORM ==~ /x86-64_linux.*/) && ((SDK_VERSION.toLowerCase() == 'next') || (SDK_VERSION.toInteger() >= 17)))) {
+                            create_docker_image_locally()
+                        }
                         prepare_docker_environment()
                         docker.image(DOCKER_IMAGE_ID).inside("-v /home/jenkins/openjdk_cache:/home/jenkins/openjdk_cache:rw,z -v /home/jenkins/.ssh:/home/jenkins/.ssh:rw,z") {
                             _build_all()

buildenv/jenkins/variables/defaults.yml

@@ -175,12 +175,6 @@ boot_jdk_default:
 cuda:
   extra_configure_options: '--enable-cuda'
 #========================================#
-# CUDA version 9
-#========================================#
-cuda_9:
-  extends: ['cuda']
-  extra_configure_options: '--with-cuda=/usr/local/cuda-9.0'
-#========================================#
 # CUDA default version
 #========================================#
 cuda_default:
@@ -217,7 +211,7 @@ ojdk292:
 # Linux PPCLE 64bits
 #========================================#
 ppc64le_linux:
-  extends: ['boot_jdk_default', 'cuda_9', 'debuginfo', 'openjdk_reference_repo', 'openssl']
+  extends: ['boot_jdk_default', 'cuda_default', 'debuginfo', 'openjdk_reference_repo', 'openssl']
   boot_jdk:
     arch: 'ppc64le'
     os: 'linux'
@@ -226,10 +220,11 @@ ppc64le_linux:
     8: 'linux-ppc64le-normal-server-release'
     11: 'linux-ppc64le-normal-server-release'
   node_labels:
-    build: 'ci.role.build && hw.arch.ppc64le && sw.os.cent.7'
+    build: 'ci.role.build && hw.arch.ppc64le && sw.tool.docker'
+    docker_image: 'adoptopenjdk/centos7_build_image:latest'
   build_env:
-    cmd:
-      all: 'source /home/jenkins/set_gcc_11.2.0_env'
+    vars:
+      all: 'CC=/usr/local/gcc11/bin/gcc-11.2 CXX=/usr/local/gcc11/bin/g++-11.2'
 #========================================#
 # Linux PPCLE 64bits /w JITSERVER
 #========================================#
@@ -298,22 +293,14 @@ x86-64_linux:
     11: 'linux-x86_64-normal-server-release'
   node_labels:
     build:
-      all: 'ci.role.build && hw.arch.x86 && sw.os.cent.7'
-      8: 'ci.role.build && hw.arch.x86 && sw.tool.docker'
-      11: 'ci.role.build && hw.arch.x86 && sw.tool.docker'
+      all: 'ci.role.build && hw.arch.x86 && sw.tool.docker'
     docker_image:
       8: 'eclipseopenj9/jenkins-agent-x86-centos6:29'
       11: 'eclipseopenj9/jenkins-agent-x86-centos6:29'
+      all: 'adoptopenjdk/centos7_build_image:latest'
   build_env:
-    cmd:
-      all: 'source /home/jenkins/set_gcc_11.2.0_env'
-      # use env vars to configure gcc for 8, 11 (v11.2)
-      8: ''
-      11: ''
     vars:
-      all: 'OPENJ9_JAVA_OPTIONS=-Xdump:system+java:events=systhrow,filter=java/lang/ClassCastException,request=exclusive+prepwalk+preempt'
-      8: 'CC=/usr/local/gcc11/bin/gcc-11.2 CXX=/usr/local/gcc11/bin/g++-11.2'
-      11: 'CC=/usr/local/gcc11/bin/gcc-11.2 CXX=/usr/local/gcc11/bin/g++-11.2'
+      all: 'CC=/usr/local/gcc11/bin/gcc-11.2 CXX=/usr/local/gcc11/bin/g++-11.2'
   extra_test_labels:
     11: '!sw.os.cent.6'
     17: '!sw.os.cent.6'