Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

YBuild Update for Java 24 #2438

Merged
merged 1 commit into from
Oct 8, 2024
Merged

YBuild Update for Java 24 #2438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion JenkinsJobs/YBuilds/Y_build.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions ...s/YBuilds/Y_unit_cen64_gtk3_java23.groovy → ...s/YBuilds/Y_unit_cen64_gtk3_java24.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ 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)
}

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 {
Expand All @@ -28,7 +28,7 @@ pipeline {
}
agent {
kubernetes {
label 'centos-unitpod22'
label 'centos-unitpod24'
defaultContainer 'custom'
yaml """
apiVersion: v1
Expand Down Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions cje-production/Y-build/buildproperties.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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/"

Expand Down
2 changes: 1 addition & 1 deletion cje-production/Y-build/publish.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
<!-- else normal unit tests configs -->
<property
name="testsConfigExpected"
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-java23_linux.gtk.x86_64_23" />
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" />

<condition
property="expectedConfigFilename"
Expand Down
2 changes: 1 addition & 1 deletion cje-production/Y-build/testConfigs.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-macM1-java17_macosx.cocoa.aarch64_17";
$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk3-java17_linux.gtk.x86_64_17";
$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk3-java21_linux.gtk.x86_64_21";
$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk3-java23_linux.gtk.x86_64_23";
$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk3-java24_linux.gtk.x86_64_24";
6 changes: 3 additions & 3 deletions ...roduction/streams/repositories_java23.txt → ...roduction/streams/repositories_java24.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ equinox: master
equinox.p2: master
eclipse.jdt: master
eclipse.jdt.core.binaries: master
eclipse.jdt.core: BETA_JAVA23
eclipse.jdt.debug: BETA_JAVA23
eclipse.jdt.ui: BETA_JAVA23
eclipse.jdt.core: BETA_JAVA24
eclipse.jdt.debug: master
eclipse.jdt.ui: master
eclipse.pde: master
eclipse.platform.debug: master
eclipse.platform.resources: master
Expand Down
0 ...tion/streams/repositories_java23patch.txt → ...tion/streams/repositories_java24patch.txt
View file
Open in desktop
File renamed without changes.
0 ...s/templateFiles/index.template_java23.php → ...s/templateFiles/index.template_java24.php
View file
Open in desktop
File renamed without changes.
Loading