diff --git a/docker/ci/config/jdk-setup.sh b/docker/ci/config/jdk-setup.sh index 1392f45d89..9af6a31934 100755 --- a/docker/ci/config/jdk-setup.sh +++ b/docker/ci/config/jdk-setup.sh @@ -23,12 +23,14 @@ case "${ARCH}" in JDKS+="d10efb2afad3ed3d7bac9d3249cea77928aca6acb973cac0f90a2dd3606a3533@https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u332-b09/OpenJDK8U-jdk_aarch64_linux_hotspot_8u332b09.tar.gz " JDKS+="999fbd90b070f9896142f0eb28354abbeb367cbe49fd86885c626e2999189e0a@https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15%2B10/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.15_10.tar.gz " JDKS+="2e3c19c1707205c6b90cc04b416e8d83078ed98417d5a69dce3cf7dc0d7cfbca@https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.3%2B7/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.3_7.tar.gz " + JDKS+="5e8d7b3189364afd78d936bad140dbe1e7025d4b96d530ed5536d035c21afb7c@https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jdk_aarch64_linux_hotspot_19.0.1_10.tar.gz " ;; amd64|x86_64) # Use "@" format to collect all JDK platform specific distributions JDKS+="adc13a0a0540d77f0a3481b48f10d61eb203e5ad4914507d489c2de3bd3d83da@https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u332-b09/OpenJDK8U-jdk_x64_linux_hotspot_8u332b09.tar.gz " JDKS+="5fdb4d5a1662f0cca73fec30f99e67662350b1fa61460fa72e91eb9f66b54d0b@https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.15%2B10/OpenJDK11U-jdk_x64_linux_hotspot_11.0.15_10.tar.gz " JDKS+="81f5bed21077f9fbb04909b50391620c78b9a3c376593c0992934719c0de6b73@https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.3%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.3_7.tar.gz " + JDKS+="163da7ea140210bae97c6a4590c757858ab4520a78af0e3e33129863d4087552@https://github.com/adoptium/temurin19-binaries/releases/download/jdk-19.0.1%2B10/OpenJDK19U-jdk_x64_linux_hotspot_19.0.1_10.tar.gz " ;; *) echo "Unsupported arch: ${ARCH}" diff --git a/docker/ci/dockerfiles/current/build.centos7.opensearch.x64.arm64.dockerfile b/docker/ci/dockerfiles/current/build.centos7.opensearch.x64.arm64.dockerfile index e78c1a9b14..cb0c61e5d7 100644 --- a/docker/ci/dockerfiles/current/build.centos7.opensearch.x64.arm64.dockerfile +++ b/docker/ci/dockerfiles/current/build.centos7.opensearch.x64.arm64.dockerfile @@ -45,7 +45,7 @@ RUN yum install -y nss xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-utils RUN yum groupinstall -y "Development Tools" && yum clean all && rm -rf /var/cache/yum/* # Tools setup -COPY --chown=0:0 config/jdk-setup.sh config/yq-setup.sh /tmp +COPY --chown=0:0 config/jdk-setup.sh config/yq-setup.sh /tmp/ RUN /tmp/jdk-setup.sh && /tmp/yq-setup.sh # Install higher version of maven 3.8.x diff --git a/docker/ci/dockerfiles/current/build.rockylinux8.opensearch.x64.arm64.dockerfile b/docker/ci/dockerfiles/current/build.rockylinux8.opensearch.x64.arm64.dockerfile index c9f448fb6a..78baade2b1 100644 --- a/docker/ci/dockerfiles/current/build.rockylinux8.opensearch.x64.arm64.dockerfile +++ b/docker/ci/dockerfiles/current/build.rockylinux8.opensearch.x64.arm64.dockerfile @@ -45,7 +45,7 @@ RUN dnf install -y nss xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-utils RUN dnf groupinstall -y "Development Tools" && dnf clean all && rm -rf /var/cache/dnf/* # Tools setup -COPY --chown=0:0 config/jdk-setup.sh config/yq-setup.sh /tmp +COPY --chown=0:0 config/jdk-setup.sh config/yq-setup.sh /tmp/ RUN /tmp/jdk-setup.sh && /tmp/yq-setup.sh # Install higher version of maven 3.8.x diff --git a/docker/ci/dockerfiles/current/release.centos.clients.x64.arm64.dockerfile b/docker/ci/dockerfiles/current/release.centos.clients.x64.arm64.dockerfile index 8ba5cfead5..0c6da641d8 100644 --- a/docker/ci/dockerfiles/current/release.centos.clients.x64.arm64.dockerfile +++ b/docker/ci/dockerfiles/current/release.centos.clients.x64.arm64.dockerfile @@ -33,7 +33,7 @@ RUN yum install -y @development zlib-devel bzip2 bzip2-devel readline-devel sqli RUN yum groupinstall -y "Development Tools" && yum clean all && rm -rf /var/cache/yum/* # Tools setup -COPY --chown=0:0 config/jdk-setup.sh config/yq-setup.sh /tmp +COPY --chown=0:0 config/jdk-setup.sh config/yq-setup.sh /tmp/ RUN /tmp/jdk-setup.sh && /tmp/yq-setup.sh # Create user group @@ -107,4 +107,4 @@ ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH # This will fail the docker build if any of the packages not exist RUN node -v RUN npm -v -RUN yarn -v \ No newline at end of file +RUN yarn -v diff --git a/jenkins/gradle/gradle-check.jenkinsfile b/jenkins/gradle/gradle-check.jenkinsfile index bd8d86932c..939c7c61cc 100644 --- a/jenkins/gradle/gradle-check.jenkinsfile +++ b/jenkins/gradle/gradle-check.jenkinsfile @@ -60,6 +60,7 @@ pipeline { JAVA11_HOME="/var/jenkins/tools/hudson.model.JDK/openjdk-11" JAVA14_HOME="/var/jenkins/tools/hudson.model.JDK/openjdk-14" JAVA17_HOME="/var/jenkins/tools/hudson.model.JDK/openjdk-17" + JAVA19_HOME="/var/jenkins/tools/hudson.model.JDK/openjdk-19" USER_BUILD_CAUSE = currentBuild.getBuildCauses('hudson.model.Cause$UserIdCause') TIMER_BUILD_CAUSE = currentBuild.getBuildCauses('hudson.triggers.TimerTrigger$TimerTriggerCause') } @@ -100,6 +101,15 @@ pipeline { sh("ls ${JAVA17_HOME}/.. | grep openjdk-17") } } + stage('Install openjdk-19') { + tools { + jdk 'openjdk-19' + } + steps { + echo "Install openjdk-19" + sh("ls ${JAVA19_HOME}/.. | grep openjdk-19") + } + } stage('Run Gradle Check') { steps { script {