Skip to content

Commit 9a65698

Browse files
committed
[Build] Always run Eclipse at the storage-server with Java-21
Adding a new I-build to the I-build composite seems to not work at the moment and running Eclipse to perform the addition with Java-17 although the Eclipse-SDK/Platform products now require Java-21 could be a cause. A Java-21 JDK was installed via - https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/5780
1 parent e240ada commit 9a65698

File tree

4 files changed

+3
-7
lines changed

4 files changed

+3
-7
lines changed

JenkinsJobs/Builds/markBuild.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ pipeline {
6969
7070
#triggering ant runner
7171
baseBuilderDir=${workspace}/eclipse
72-
javaCMD=/opt/public/common/java/openjdk/jdk-17_x64-latest/bin/java
72+
javaCMD=/opt/public/common/java/openjdk/jdk-21_x64-latest/bin/java
7373
7474
launcherJar=$(ssh [email protected] find ${baseBuilderDir}/. -name "org.eclipse.equinox.launcher_*.jar" | sort | head -1 )
7575

cje-production/mbscripts/mb620_promoteUpdateSite.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ source $1
2525
epUpdateDir=/home/data/httpd/download.eclipse.org/eclipse/updates
2626
dropsPath=${epUpdateDir}/${STREAMMajor}.${STREAMMinor}-${BUILD_TYPE}-builds
2727
latestRelDir=/home/data/httpd/download.eclipse.org/eclipse/downloads/drops4
28-
java_home=/opt/public/common/java/openjdk/jdk-17_x64-latest/bin
28+
java_home=/opt/public/common/java/openjdk/jdk-21_x64-latest/bin
2929

3030
pushd $CJE_ROOT/$UPDATES_DIR
3131
scp -r ${BUILD_ID} [email protected]:${dropsPath}/.

cje-production/promotion/makeVisible.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ then
181181

182182
#triggering ant runner
183183
baseBuilderDir=${workspace}/eclipse
184-
javaCMD=/opt/public/common/java/openjdk/jdk-17_x64-latest/bin/java
184+
javaCMD=/opt/public/common/java/openjdk/jdk-21_x64-latest/bin/java
185185

186186
launcherJar=$(ssh [email protected] find ${baseBuilderDir}/. -name "org.eclipse.equinox.launcher_*.jar" | sort | head -1 )
187187

production/testScripts/updateTestResultsPages.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,6 @@ then
101101
exit 1
102102
fi
103103

104-
JAVA_11_HOME=${JAVA_11_HOME:-/opt/public/common/java/openjdk/jdk-11_x64-latest}
105-
106-
export JAVA_HOME=${JAVA_HOME:-${JAVA_11_HOME}}
107-
108104
devJRE=$JAVA_HOME/jre/bin/java
109105

110106
if [[ ! -n ${devJRE} && -x ${devJRE} ]]

0 commit comments

Comments
 (0)