From 1015e772c8a73157ffb660e2058f9ca98e455435 Mon Sep 17 00:00:00 2001 From: Rahul Mohanan <121536011+MohananRahul@users.noreply.github.com> Date: Tue, 8 Oct 2024 14:20:21 +0530 Subject: [PATCH] YBuild Update for Java 24 (#2438) --- JenkinsJobs/YBuilds/Y_build.groovy | 2 +- ...gtk3_java23.groovy => Y_unit_cen64_gtk3_java24.groovy} | 8 ++++---- cje-production/Y-build/buildproperties.txt | 6 +++--- cje-production/Y-build/publish.xml | 2 +- cje-production/Y-build/testConfigs.php | 2 +- .../{repositories_java23.txt => repositories_java24.txt} | 6 +++--- ...ories_java23patch.txt => repositories_java24patch.txt} | 0 ...ndex.template_java23.php => index.template_java24.php} | 0 8 files changed, 13 insertions(+), 13 deletions(-) rename JenkinsJobs/YBuilds/{Y_unit_cen64_gtk3_java23.groovy => Y_unit_cen64_gtk3_java24.groovy} (98%) rename cje-production/streams/{repositories_java23.txt => repositories_java24.txt} (84%) rename cje-production/streams/{repositories_java23patch.txt => repositories_java24patch.txt} (100%) rename eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/{index.template_java23.php => index.template_java24.php} (100%) diff --git a/JenkinsJobs/YBuilds/Y_build.groovy b/JenkinsJobs/YBuilds/Y_build.groovy index b9d690aa7c2..9f021425df7 100644 --- a/JenkinsJobs/YBuilds/Y_build.groovy +++ b/JenkinsJobs/YBuilds/Y_build.groovy @@ -17,7 +17,7 @@ for (STREAM in STREAMS){ # format: Minute Hour Day Month Day of the week (0-7) #Daily Y-build -#0 10 * * 3,5 +0 10 * * 3,5 #milestone week #0 6 * * 2 #0 6 * * 4 diff --git a/JenkinsJobs/YBuilds/Y_unit_cen64_gtk3_java23.groovy b/JenkinsJobs/YBuilds/Y_unit_cen64_gtk3_java24.groovy similarity index 98% rename from JenkinsJobs/YBuilds/Y_unit_cen64_gtk3_java23.groovy rename to JenkinsJobs/YBuilds/Y_unit_cen64_gtk3_java24.groovy index fb4a5801f86..977cf4e7d41 100644 --- a/JenkinsJobs/YBuilds/Y_unit_cen64_gtk3_java23.groovy +++ b/JenkinsJobs/YBuilds/Y_unit_cen64_gtk3_java24.groovy @@ -5,7 +5,7 @@ for (STREAM in STREAMS){ def MAJOR = STREAM.split('\\.')[0] def MINOR = STREAM.split('\\.')[1] - pipelineJob('YPBuilds/ep' + MAJOR + MINOR + 'Y-unit-cen64-gtk3-java22'){ + pipelineJob('YPBuilds/ep' + MAJOR + MINOR + 'Y-unit-cen64-gtk3-java24'){ logRotator { numToKeep(5) @@ -13,7 +13,7 @@ for (STREAM in STREAMS){ parameters { stringParam('buildId', null, null) - stringParam('javaDownload', 'https://download.java.net/java/early_access/jdk23/27/GPL/openjdk-23-ea+27_linux-x64_bin.tar.gz', null) + stringParam('javaDownload', 'https://download.java.net/java/early_access/jdk24/18/GPL/openjdk-24-ea+18_linux-x64_bin.tar.gz', null) } definition { @@ -28,7 +28,7 @@ pipeline { } agent { kubernetes { - label 'centos-unitpod22' + label 'centos-unitpod24' defaultContainer 'custom' yaml """ apiVersion: v1 @@ -89,7 +89,7 @@ spec: steps { container ('custom'){ wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) { - withEnv(["JAVA_HOME_NEW=${ tool 'openjdk-jdk18-latest' }"]) { + withEnv(["JAVA_HOME_NEW=${ tool 'openjdk-jdk23-latest' }"]) { withAnt(installation: 'apache-ant-latest') { sh \'\'\'#!/bin/bash -x diff --git a/cje-production/Y-build/buildproperties.txt b/cje-production/Y-build/buildproperties.txt index f1c4578d795..ddc435b1e1c 100644 --- a/cje-production/Y-build/buildproperties.txt +++ b/cje-production/Y-build/buildproperties.txt @@ -17,8 +17,8 @@ # CJE build variables BRANCH="master" -PATCH_OR_BRANCH_LABEL="java23" -BUILD_TYPE_NAME="Beta Java 23" +PATCH_OR_BRANCH_LABEL="java24" +BUILD_TYPE_NAME="Beta Java 24" BUILD_TYPE="Y" TESTED_BUILD_TYPE="Y" RELEASE_VER="4.34" @@ -55,7 +55,7 @@ BASEBUILD_ID="R-4.33-202409030240" PREVIOUS_RELEASE_ID="R-4.33-202409030240" BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/" -WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.31.0/R-3.31.0-20230903090456/repositoryunittests/" +WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.33.0/R-3.33.0-20240304165142/repositoryunittests/" BASEBUILDER_DIR="tmp/org.eclipse.releng.basebuilder" ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.34-I-builds/" diff --git a/cje-production/Y-build/publish.xml b/cje-production/Y-build/publish.xml index 1f79dd18878..4fade4298aa 100644 --- a/cje-production/Y-build/publish.xml +++ b/cje-production/Y-build/publish.xml @@ -184,7 +184,7 @@ + value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64-java17_macosx.cocoa.x86_64_17,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-macM1-java17_macosx.cocoa.aarch64_17,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32-java17_win32.win32.x86_64_17,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java17_linux.gtk.x86_64_17,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java21_linux.gtk.x86_64_21,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java24_linux.gtk.x86_64_24" />