IBuild schedule update and Performance test fixing (#1594)

Java home update to java17
eclipse-platform · Nov 28, 2023 · 63ea81c · 63ea81c
1 parent fb724fe
commit 63ea81c
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 11 deletions.
diff --git a/JenkinsJobs/Builds/I_build.groovy b/JenkinsJobs/Builds/I_build.groovy
@@ -19,13 +19,13 @@ for (STREAM in STREAMS){
 # - - - Integration Eclipse SDK builds - - - 
 # 2023-12 Release Schedule
 # Normal : 6 PM every day (1/6 - 2/9)
-#0 18 * * *
+0 18 * * *
 
 
 # Milestone/RC Schedule 
 # Post M1, no nightlies, I-builds only. (Be sure to "turn off" for tests and sign off days)
-0 6 6-22 11 5-7,1-3
-0 18 5-22 11 5-7,1-3
+#0 6 6-22 11 5-7,1-3
+#0 18 5-22 11 5-7,1-3
 
 
 

diff --git a/JenkinsJobs/PerformanceTests/ILR_perf_lin64.groovy b/JenkinsJobs/PerformanceTests/ILR_perf_lin64.groovy
@@ -139,9 +139,23 @@ set +x
 
 #export PATH=${JAVA_HOME}/bin:${ANT_HOME}/bin:${PATH}
 
-JAVA_HOME=`readlink -f /usr/bin/java | sed "s:jre/::" | sed "s:bin/java::"`
-
+#JAVA_HOME=`readlink -f /usr/bin/java | sed "s:jre/::" | sed "s:bin/java::"`
+
+set -x
+mkdir -p ${WORKSPACE}/java
+pushd ${WORKSPACE}/java
+wget -O jdk.tar.gz --no-verbose https://download.java.net/java/GA/jdk17.0.2/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/openjdk-17.0.2_linux-x64_bin.tar.gz
+tar xzf jdk.tar.gz
+rm jdk.tar.gz
+export JAVA_HOME_NEW=$(pwd)/$(ls)
+popd
+set +x
+export PATH=${JAVA_HOME_NEW}/bin:${ANT_HOME}/bin:${PATH}                                
+                                
 echo JAVA_HOME: $JAVA_HOME
+export JAVA_HOME=$JAVA_HOME_NEW
+
+#echo JAVA_HOME: $JAVA_HOME
 echo ANT_HOME: $ANT_HOME
 echo PATH: $PATH
 

diff --git a/JenkinsJobs/PerformanceTests/ILR_perf_lin64_baseline.groovy b/JenkinsJobs/PerformanceTests/ILR_perf_lin64_baseline.groovy
@@ -138,11 +138,25 @@ cat buildproperties.shsource
 source ./buildproperties.shsource
 set +x
 
-export JAVA_HOME=`readlink -f /usr/bin/java | sed "s:jre/::" | sed "s:bin/java::"`
+#export JAVA_HOME=`readlink -f /usr/bin/java | sed "s:jre/::" | sed "s:bin/java::"`
 echo $JAVA_HOME
 #export ANT_HOME=/shared/common/apache-ant-1.9.6
 
-export PATH=${JAVA_HOME}/bin:${PATH}
+set -x
+mkdir -p ${WORKSPACE}/java
+pushd ${WORKSPACE}/java
+wget -O jdk.tar.gz --no-verbose https://download.java.net/java/GA/jdk17.0.2/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/openjdk-17.0.2_linux-x64_bin.tar.gz
+tar xzf jdk.tar.gz
+rm jdk.tar.gz
+export JAVA_HOME_NEW=$(pwd)/$(ls)
+popd
+set +x
+export PATH=${JAVA_HOME_NEW}/bin:${ANT_HOME}/bin:${PATH}                                
+                                
+echo JAVA_HOME: $JAVA_HOME
+export JAVA_HOME=$JAVA_HOME_NEW
+
+#export PATH=${JAVA_HOME}/bin:${PATH}
 export baselinePerf=true
 
 echo JAVA_HOME: $JAVA_HOME

diff --git a/JenkinsJobs/PerformanceTests/I_perf_lin64.groovy b/JenkinsJobs/PerformanceTests/I_perf_lin64.groovy
@@ -143,10 +143,24 @@ set +x
 
 #export PATH=${JAVA_HOME}/bin:${ANT_HOME}/bin:${PATH}
 
-JAVA_HOME=`readlink -f /usr/bin/java | sed "s:jre/::" | sed "s:bin/java::"`
+#JAVA_HOME=`readlink -f /usr/bin/java | sed "s:jre/::" | sed "s:bin/java::"`
+
+set -x
+mkdir -p ${WORKSPACE}/java
+pushd ${WORKSPACE}/java
+wget -O jdk.tar.gz --no-verbose https://download.java.net/java/GA/jdk17.0.2/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/openjdk-17.0.2_linux-x64_bin.tar.gz
+tar xzf jdk.tar.gz
+rm jdk.tar.gz
+export JAVA_HOME_NEW=$(pwd)/$(ls)
+popd
+set +x
+export PATH=${JAVA_HOME_NEW}/bin:${ANT_HOME}/bin:${PATH}                                
+                                
+echo JAVA_HOME: $JAVA_HOME
+export JAVA_HOME=$JAVA_HOME_NEW
 
 
-echo JAVA_HOME: $JAVA_HOME
+#echo JAVA_HOME: $JAVA_HOME
 echo ANT_HOME: $ANT_HOME
 echo PATH: $PATH
 

diff --git a/JenkinsJobs/PerformanceTests/I_perf_lin64_baseline.groovy b/JenkinsJobs/PerformanceTests/I_perf_lin64_baseline.groovy
@@ -142,9 +142,23 @@ source ./buildproperties.shsource
 #export PATH=${JAVA_HOME}/bin:${ANT_HOME}/bin:${PATH}
 export baselinePerf=true
 
-JAVA_HOME=`readlink -f /usr/bin/java | sed "s:jre/::" | sed "s:bin/java::"`
-
+#JAVA_HOME=`readlink -f /usr/bin/java | sed "s:jre/::" | sed "s:bin/java::"`
+
+set -x
+mkdir -p ${WORKSPACE}/java
+pushd ${WORKSPACE}/java
+wget -O jdk.tar.gz --no-verbose https://download.java.net/java/GA/jdk17.0.2/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/openjdk-17.0.2_linux-x64_bin.tar.gz
+tar xzf jdk.tar.gz
+rm jdk.tar.gz
+export JAVA_HOME_NEW=$(pwd)/$(ls)
+popd
+set +x
+export PATH=${JAVA_HOME_NEW}/bin:${ANT_HOME}/bin:${PATH}                                
+                                
 echo JAVA_HOME: $JAVA_HOME
+export JAVA_HOME=$JAVA_HOME_NEW
+
+#echo JAVA_HOME: $JAVA_HOME
 echo ANT_HOME: $ANT_HOME
 echo PATH: $PATH
 echo baselinePerf: $baselinePerf