[Build] Get getEBuilder directly from git and remove obsolete parameters

Remove the definitions of the properties 'EBUILDER_HASH' and 'downloadURL' that are not necessary anymore to be passed to the 'getEBuilder' ant-script. And remove the 'eclipseStream' property that now can be computed by the 'getEBuilder' ant-script. Also rename the folder containing the getEBuilder.xml from to just 'bootstrap' since Hudson is not used anymore.
eclipse-platform · Nov 30, 2024 · 1761bea · 1761bea
1 parent a8bbcec
commit 1761bea
Show file tree

Hide file tree

Showing 29 changed files with 93 additions and 142 deletions.
diff --git a/JenkinsJobs/AutomatedTests/I_unit_linux.groovy b/JenkinsJobs/AutomatedTests/I_unit_linux.groovy
@@ -68,9 +68,7 @@ pipeline {
                         # we want java.io.tmpdir to be in $WORKSPACE, but must already exist, for Java to use it.
                         mkdir -p tmp
                         
-                        curl -o getEBuilder.xml https://download.eclipse.org/eclipse/relengScripts/production/testScripts/hudsonBootstrap/getEBuilder.xml
-                        curl -o buildproperties.shsource https://download.eclipse.org/eclipse/downloads/drops4/${buildId}/buildproperties.shsource
-                        source buildproperties.shsource
+                        curl -o getEBuilder.xml https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/master/production/testScripts/bootstrap/getEBuilder.xml
                         
                         echo JAVA_HOME: $JAVA_HOME
                         echo ANT_HOME: $ANT_HOME
@@ -80,8 +78,7 @@ pipeline {
                         ant -diagnostics 1>antDiagnostics.txt 2>&1
                         java -XshowSettings -version 1>javaSettings.txt 2>&1
                         
-                        ant -f getEBuilder.xml -DbuildId=${buildId} -DeclipseStream=${STREAM} -DEBUILDER_HASH=${EBUILDER_HASH} \\
-                          -DdownloadURL=https://download.eclipse.org/eclipse/downloads/drops4/${buildId} \\
+                        ant -f getEBuilder.xml -DbuildId=${buildId} \\
                           -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 \\
                           -DtestSuite=all
                         # For smaller test-suites see: https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/be721e33c916b03c342e7b6f334220c6124946f8/production/testScripts/configuration/sdk.tests/testScripts/test.xml#L1893-L1903

diff --git a/JenkinsJobs/AutomatedTests/I_unit_mac.groovy b/JenkinsJobs/AutomatedTests/I_unit_mac.groovy
@@ -61,9 +61,7 @@ echo "umask explicitly set to 0002, old value was $oldumask"
 # we want java.io.tmpdir to be in $WORKSPACE, but must already exist, for Java to use it.
 mkdir -p tmp
 
-curl -o getEBuilder.xml https://download.eclipse.org/eclipse/relengScripts/production/testScripts/hudsonBootstrap/getEBuilder.xml
-curl -o buildproperties.shsource https://download.eclipse.org/eclipse/downloads/drops4/${buildId}/buildproperties.shsource
-source buildproperties.shsource
+curl -o getEBuilder.xml https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/master/production/testScripts/bootstrap/getEBuilder.xml
 
 echo JAVA_HOME: $JAVA_HOME
 echo ANT_HOME: $ANT_HOME
@@ -73,8 +71,7 @@ env 1>envVars.txt 2>&1
 ant -diagnostics 1>antDiagnostics.txt 2>&1
 java -XshowSettings -version 1>javaSettings.txt 2>&1
 
-ant -f getEBuilder.xml -DbuildId=${buildId} -DeclipseStream=${STREAM} -DEBUILDER_HASH=${EBUILDER_HASH} \\
-  -DdownloadURL=https://download.eclipse.org/eclipse/downloads/drops4/${buildId} \\
+ant -f getEBuilder.xml -DbuildId=${buildId} \\
   -Dosgi.os=macosx -Dosgi.ws=cocoa -Dosgi.arch=${eclipseArch} \\
   -DtestSuite=all
 # For smaller test-suites see: https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/be721e33c916b03c342e7b6f334220c6124946f8/production/testScripts/configuration/sdk.tests/testScripts/test.xml#L1893-L1903

diff --git a/JenkinsJobs/AutomatedTests/I_unit_win32.groovy b/JenkinsJobs/AutomatedTests/I_unit_win32.groovy
@@ -46,14 +46,7 @@ pipeline {
 mkdir tmp
 
 @REM Note: currently this file always comes from master, no matter what branch is being built/tested.
-curl -o getEBuilder.xml https://download.eclipse.org/eclipse/relengScripts/production/testScripts/hudsonBootstrap/getEBuilder.xml
-curl -o buildProperties.properties https://download.eclipse.org/eclipse/downloads/drops4/%buildId%/buildproperties.properties
-echo off
-For /F "tokens=1* delims==" %%A IN (buildProperties.properties) DO (
- IF "%%A"=="STREAM " set STREAM=%%B
- IF "%%A"=="EBUILDER_HASH " set EBUILDER_HASH=%%B
-) 
-echo on
+curl -o getEBuilder.xml https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/master/production/testScripts/bootstrap/getEBuilder.xml
 
 set JAVA_HOME
 set ANT_HOME
@@ -63,8 +56,7 @@ env 1>envVars.txt 2>&1
 cmd /c ant -diagnostics 1>antDiagnostics.txt 2>&1
 java -XshowSettings -version 1>javaSettings.txt 2>&1
 
-ant -f getEBuilder.xml -DbuildId=%buildId%  -DeclipseStream=%STREAM% -DEBUILDER_HASH=%EBUILDER_HASH% ^
-  -DdownloadURL="https://download.eclipse.org/eclipse/downloads/drops4/%buildId%" ^
+ant -f getEBuilder.xml -DbuildId=%buildId% ^
   -Dargs=all -Dosgi.os=win32 -Dosgi.ws=win32 -Dosgi.arch=x86_64 ^
   -DtestSuite=all
 @REM For smaller test-suites see: https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/be721e33c916b03c342e7b6f334220c6124946f8/production/testScripts/configuration/sdk.tests/testScripts/test.xml#L1893-L1903

diff --git a/JenkinsJobs/Builds/I_build.groovy b/JenkinsJobs/Builds/I_build.groovy
@@ -148,7 +148,6 @@ spec:
                     env.BUILD_IID = sh(script:'echo $(source $CJE_ROOT/buildproperties.shsource;echo $BUILD_TYPE$TIMESTAMP)', returnStdout: true)
                     env.BUILD_VERSION = sh(script:'echo $(source $CJE_ROOT/buildproperties.shsource;echo $RELEASE_VER)', returnStdout: true)
                     env.STREAM = sh(script:'echo $(source $CJE_ROOT/buildproperties.shsource;echo $STREAM)', returnStdout: true)
-                    env.EBUILDER_HASH = sh(script:'echo $(source $CJE_ROOT/buildproperties.shsource;echo $EBUILDER_HASH)', returnStdout: true)
                     env.RELEASE_VER = sh(script:'echo $(source $CJE_ROOT/buildproperties.shsource;echo $RELEASE_VER)', returnStdout: true)
                   }
                 }
@@ -335,7 +334,6 @@ spec:
                     env.COMPARATOR_ERRORS_BODY = sh(script:'echo $(source $CJE_ROOT/buildproperties.shsource;echo $COMPARATOR_ERRORS_BODY)', returnStdout: true)
                     env.POM_UPDATES_SUBJECT = sh(script:'echo $(source $CJE_ROOT/buildproperties.shsource;echo $POM_UPDATES_SUBJECT)', returnStdout: true)
                     env.POM_UPDATES_BODY = sh(script:'echo $(source $CJE_ROOT/buildproperties.shsource;echo $POM_UPDATES_BODY)', returnStdout: true)
-                    env.EBUILDER_HASH = sh(script:'echo $(source $CJE_ROOT/buildproperties.shsource;echo $EBUILDER_HASH)', returnStdout: true)
                     env.RELEASE_VER = sh(script:'echo $(source $CJE_ROOT/buildproperties.shsource;echo $RELEASE_VER)', returnStdout: true)
                   }
                 }

diff --git a/JenkinsJobs/PerformanceTests/ILR_perf_lin64.groovy b/JenkinsJobs/PerformanceTests/ILR_perf_lin64.groovy
@@ -126,10 +126,7 @@ echo "umask explicitly set to 0002, old value was $oldumask"
 # we want java.io.tmpdir to be in $WORKSPACE, but must already exist, for Java to use it.
 mkdir -p tmp
 
-wget -O getEBuilder.xml --no-verbose https://download.eclipse.org/eclipse/relengScripts/production/testScripts/hudsonBootstrap/getEBuilder.xml 2>&1
-curl -o buildproperties.shsource https://download.eclipse.org/eclipse/downloads/drops4/${buildId}/buildproperties.shsource
-cat buildproperties.shsource
-source ./buildproperties.shsource
+curl -o getEBuilder.xml https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/master/production/testScripts/bootstrap/getEBuilder.xml
 set +x
 
 #export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.201.b09-2.el7_6.x86_64
@@ -163,7 +160,9 @@ env 1>envVars.txt 2>&1
 ant -diagnostics 1>antDiagnostics.txt 2>&1
 java -XshowSettings -version 1>javaSettings.txt 2>&1
 
-ant -f getEBuilder.xml -Djava.io.tmpdir=${WORKSPACE}/tmp -DbuildId=$buildId -Djvm=$JAVA_HOME/bin/java -DeclipseStream=${STREAM} -DEBUILDER_HASH=${EBUILDER_HASH}  -DdownloadURL=http://download.eclipse.org/eclipse/downloads/drops4/${buildId}  -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 -DtestSuite=${testToRun} -Dtest.target=performance
+ant -f getEBuilder.xml -Djava.io.tmpdir=${WORKSPACE}/tmp -DbuildId=$buildId -Djvm=$JAVA_HOME/bin/java \\
+  -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 \\
+  -DtestSuite=${testToRun} -Dtest.target=performance
 
 RAW_DATE_END="$(date +%s )"
 

diff --git a/JenkinsJobs/PerformanceTests/ILR_perf_lin64_baseline.groovy b/JenkinsJobs/PerformanceTests/ILR_perf_lin64_baseline.groovy
@@ -130,10 +130,7 @@ echo "umask explicitly set to 0002, old value was $oldumask"
 mkdir -p tmp
 
 
-wget -O getEBuilder.xml --no-verbose https://download.eclipse.org/eclipse/relengScripts/production/testScripts/hudsonBootstrap/getEBuilder.xml 2>&1
-curl -o buildproperties.shsource https://download.eclipse.org/eclipse/downloads/drops4/${buildId}/buildproperties.shsource
-cat buildproperties.shsource
-source ./buildproperties.shsource
+curl -o getEBuilder.xml https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/master/production/testScripts/bootstrap/getEBuilder.xml
 set +x
 
 #export JAVA_HOME=`readlink -f /usr/bin/java | sed "s:jre/::" | sed "s:bin/java::"`
@@ -168,7 +165,9 @@ env 1>envVars.txt 2>&1
 ant -diagnostics 1>antDiagnostics.txt 2>&1
 java -XshowSettings -version 1>javaSettings.txt 2>&1
 
-ant -f getEBuilder.xml -Djava.io.tmpdir=${WORKSPACE}/tmp -DbuildId=$buildId -Djvm=$JAVA_HOME/bin/java -DeclipseStream=${STREAM} -DEBUILDER_HASH=${EBUILDER_HASH}  -DbaselinePerf=${baselinePerf} -DdownloadURL=http://download.eclipse.org/eclipse/downloads/drops4/${buildId}  -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 -DtestSuite=${testToRun} -Dtest.target=performance
+ant -f getEBuilder.xml -Djava.io.tmpdir=${WORKSPACE}/tmp -DbuildId=$buildId -Djvm=$JAVA_HOME/bin/java -DbaselinePerf=${baselinePerf} \\
+  -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 \\
+  -DtestSuite=${testToRun} -Dtest.target=performance
 
 RAW_DATE_END="$(date +%s )"
 

diff --git a/JenkinsJobs/PerformanceTests/I_perf_lin64.groovy b/JenkinsJobs/PerformanceTests/I_perf_lin64.groovy
@@ -130,10 +130,7 @@ echo "umask explicitly set to 0002, old value was $oldumask"
 # we want java.io.tmpdir to be in $WORKSPACE, but must already exist, for Java to use it.
 mkdir -p tmp
 
-wget -O getEBuilder.xml --no-verbose https://download.eclipse.org/eclipse/relengScripts/production/testScripts/hudsonBootstrap/getEBuilder.xml 2>&1
-curl -o buildproperties.shsource https://download.eclipse.org/eclipse/downloads/drops4/${buildId}/buildproperties.shsource
-cat buildproperties.shsource
-source ./buildproperties.shsource
+curl -o getEBuilder.xml https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/master/production/testScripts/bootstrap/getEBuilder.xml
 set +x
 
 #export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.201.b09-2.el7_6.x86_64
@@ -168,7 +165,9 @@ env 1>envVars.txt 2>&1
 ant -diagnostics 1>antDiagnostics.txt 2>&1
 java -XshowSettings -version 1>javaSettings.txt 2>&1
 
-ant -f getEBuilder.xml -Djava.io.tmpdir=${WORKSPACE}/tmp -DbuildId=$buildId -Djvm=$JAVA_HOME/bin/java -DeclipseStream=${STREAM} -DEBUILDER_HASH=${EBUILDER_HASH}  -DdownloadURL=http://download.eclipse.org/eclipse/downloads/drops4/${buildId}  -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 -DtestSuite=${testToRun} -Dtest.target=performance
+ant -f getEBuilder.xml -Djava.io.tmpdir=${WORKSPACE}/tmp -DbuildId=$buildId -Djvm=$JAVA_HOME/bin/java \\
+  -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 \\
+  -DtestSuite=${testToRun} -Dtest.target=performance
 
 RAW_DATE_END="$(date +%s )"
 

diff --git a/JenkinsJobs/PerformanceTests/I_perf_lin64_baseline.groovy b/JenkinsJobs/PerformanceTests/I_perf_lin64_baseline.groovy
@@ -128,10 +128,7 @@ mkdir -p tmp
 
 echo PATH: $PATH
 
-wget -O getEBuilder.xml --no-verbose https://download.eclipse.org/eclipse/relengScripts/production/testScripts/hudsonBootstrap/getEBuilder.xml 2>&1
-curl -o buildproperties.shsource https://download.eclipse.org/eclipse/downloads/drops4/${buildId}/buildproperties.shsource
-cat buildproperties.shsource
-source ./buildproperties.shsource
+curl -o getEBuilder.xml https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/master/production/testScripts/bootstrap/getEBuilder.xml
 
 #unset JAVA_HOME
 #export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.252.b09-2.el7_8.x86_64/jre
@@ -167,7 +164,9 @@ env 1>envVars.txt 2>&1
 ant -diagnostics 1>antDiagnostics.txt 2>&1
 java -XshowSettings -version 1>javaSettings.txt 2>&1
 
-ant -f getEBuilder.xml -Djava.io.tmpdir=${WORKSPACE}/tmp -DbuildId=$buildId -Djvm=$JAVA_HOME/bin/java -DeclipseStream=${STREAM} -DEBUILDER_HASH=${EBUILDER_HASH}  -DbaselinePerf=${baselinePerf} -DdownloadURL=http://download.eclipse.org/eclipse/downloads/drops4/${buildId}  -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 -DtestSuite=${testToRun} -Dtest.target=performance
+ant -f getEBuilder.xml -Djava.io.tmpdir=${WORKSPACE}/tmp -DbuildId=$buildId -Djvm=$JAVA_HOME/bin/java -DbaselinePerf=${baselinePerf} \\
+  -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 \\
+  -DtestSuite=${testToRun} -Dtest.target=performance
 
 RAW_DATE_END="$(date +%s )"
 

diff --git a/JenkinsJobs/Releng/collectPerfResults.groovy b/JenkinsJobs/Releng/collectPerfResults.groovy
@@ -96,8 +96,7 @@ ssh [email protected]  ${javaCMD} -jar ${launcherJar} -n
   -DpostingDirectory=${dropsPath} \\
   -DbuildURL=${buildURL} \\
   -DbuildID=${buildID} \\
-  -Djob=${triggeringJob} \\
-  -DEBUILDER_HASH=${EBUILDER_HASH}
+  -Djob=${triggeringJob}
 
 #
 

diff --git a/JenkinsJobs/Releng/collectResults.groovy b/JenkinsJobs/Releng/collectResults.groovy
@@ -100,8 +100,7 @@ ssh [email protected]  ${javaCMD} -jar ${launcherJar} -n
   -DpostingDirectory=${dropsPath} \\
   -Djob=${triggeringJob} \\
   -DbuildURL=${buildURL} \\
-  -DbuildID=${buildID} \\
-  -DEBUILDER_HASH=${EBUILDER_HASH}
+  -DbuildID=${buildID}
   
 #
 devworkspace=${workspace}/workspace-updateTestResults

diff --git a/JenkinsJobs/SmokeTests/smoke_test_arm64.groovy b/JenkinsJobs/SmokeTests/smoke_test_arm64.groovy
@@ -55,11 +55,7 @@ echo "umask explicitly set to 0002, old value was $oldumask"
 # we want java.io.tmpdir to be in $WORKSPACE, but must already exist, for Java to use it.
 mkdir -p tmp
 
-wget -O getEBuilder.xml --no-verbose https://download.eclipse.org/eclipse/relengScripts/production/testScripts/hudsonBootstrap/getEBuilder.xml 2>&1
-curl -o buildproperties.shsource https://download.eclipse.org/eclipse/downloads/drops4/${buildId}/buildproperties.shsource
-cat buildproperties.shsource
-source buildproperties.shsource
-set +x
+curl -o getEBuilder.xml https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/master/production/testScripts/bootstrap/getEBuilder.xml
 
 set -x
 mkdir -p ${WORKSPACE}/java
@@ -84,7 +80,9 @@ env 1>envVars.txt 2>&1
 ant -diagnostics 1>antDiagnostics.txt 2>&1
 java -XshowSettings -version 1>javaSettings.txt 2>&1
 
-ant -f getEBuilder.xml -Djava.io.tmpdir=${WORKSPACE}/tmp -DbuildId=$buildId  -DeclipseStream=${STREAM} -DEBUILDER_HASH=${EBUILDER_HASH}  -DdownloadURL=https://download.eclipse.org/eclipse/downloads/drops4/${buildId}  -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=aarch64 -DtestSuite=${testsToRun}
+ant -f getEBuilder.xml -Djava.io.tmpdir=${WORKSPACE}/tmp -DbuildId=$buildId \\
+  -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=aarch64 \\
+  -DtestSuite=${testsToRun}
 
 RAW_DATE_END="$(date +%s )"
 

diff --git a/JenkinsJobs/SmokeTests/smoke_test_centos9.groovy b/JenkinsJobs/SmokeTests/smoke_test_centos9.groovy
@@ -98,10 +98,7 @@ spec:
                                 # we want java.io.tmpdir to be in $WORKSPACE, but must already exist, for Java to use it.
                                 mkdir -p ${WORKSPACE}/tmp
                                 
-                                wget -O ${WORKSPACE}/getEBuilder.xml --no-verbose --no-check-certificate https://download.eclipse.org/eclipse/relengScripts/production/testScripts/hudsonBootstrap/getEBuilder.xml 2>&1
-                                wget -O ${WORKSPACE}/buildproperties.shsource --no-check-certificate https://download.eclipse.org/eclipse/downloads/drops4/${buildId}/buildproperties.shsource
-                                cat ${WORKSPACE}/buildproperties.shsource
-                                source ${WORKSPACE}/buildproperties.shsource
+                                curl -o getEBuilder.xml https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/master/production/testScripts/bootstrap/getEBuilder.xml
                                 
                                 set -x
                                 mkdir -p ${WORKSPACE}/java
@@ -125,7 +122,9 @@ spec:
                                 ant -diagnostics 1>antDiagnostics.txt 2>&1
                                 java -XshowSettings -version 1>javaSettings.txt 2>&1
                                 
-                                ant -f getEBuilder.xml -Djava.io.tmpdir=${WORKSPACE}/tmp -DbuildId=$buildId  -DeclipseStream=$STREAM -DEBUILDER_HASH=${EBUILDER_HASH}  -DdownloadURL=http://download.eclipse.org/eclipse/downloads/drops4/${buildId}  -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 -DtestSuite=${testsToRun}
+                                ant -f getEBuilder.xml -Djava.io.tmpdir=${WORKSPACE}/tmp -DbuildId=$buildId \\
+                                  -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 \\
+                                  -DtestSuite=${testsToRun}
                                 
                                 RAW_DATE_END="$(date +%s )"
                                 

diff --git a/JenkinsJobs/SmokeTests/smoke_test_opensuse_leap.groovy b/JenkinsJobs/SmokeTests/smoke_test_opensuse_leap.groovy
@@ -143,10 +143,7 @@ spec:
                                 # we want java.io.tmpdir to be in $WORKSPACE, but must already exist, for Java to use it.
                                 mkdir -p ${WORKSPACE}/tmp
                                 
-                                wget -O ${WORKSPACE}/getEBuilder.xml --no-verbose --no-check-certificate https://download.eclipse.org/eclipse/relengScripts/production/testScripts/hudsonBootstrap/getEBuilder.xml 2>&1
-                                wget -O ${WORKSPACE}/buildproperties.shsource --no-check-certificate https://download.eclipse.org/eclipse/downloads/drops4/${buildId}/buildproperties.shsource
-                                cat ${WORKSPACE}/buildproperties.shsource
-                                source ${WORKSPACE}/buildproperties.shsource
+                                curl -o getEBuilder.xml https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/master/production/testScripts/bootstrap/getEBuilder.xml
                                 
                                 set -x
                                 mkdir -p ${WORKSPACE}/java
@@ -170,7 +167,9 @@ spec:
                                 ant -diagnostics 1>antDiagnostics.txt 2>&1
                                 java -XshowSettings -version 1>javaSettings.txt 2>&1
                                 
-                                ant -f getEBuilder.xml -Djava.io.tmpdir=${WORKSPACE}/tmp -DbuildId=$buildId  -DeclipseStream=$STREAM -DEBUILDER_HASH=${EBUILDER_HASH}  -DdownloadURL=http://download.eclipse.org/eclipse/downloads/drops4/${buildId}  -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 -DtestSuite=${testsToRun}
+                                ant -f getEBuilder.xml -Djava.io.tmpdir=${WORKSPACE}/tmp -DbuildId=$buildId \\
+                                  -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 \\
+                                  -DtestSuite=${testsToRun}
                                 
                                 RAW_DATE_END="$(date +%s )"
                                 

diff --git a/JenkinsJobs/SmokeTests/smoke_test_ppcle.groovy b/JenkinsJobs/SmokeTests/smoke_test_ppcle.groovy
@@ -56,11 +56,7 @@ echo "umask explicitly set to 0002, old value was $oldumask"
 # we want java.io.tmpdir to be in $WORKSPACE, but must already exist, for Java to use it.
 mkdir -p tmp
 
-wget -O getEBuilder.xml --no-verbose https://download.eclipse.org/eclipse/relengScripts/production/testScripts/hudsonBootstrap/getEBuilder.xml 2>&1
-curl -o buildproperties.shsource https://download.eclipse.org/eclipse/downloads/drops4/${buildId}/buildproperties.shsource
-cat buildproperties.shsource
-source buildproperties.shsource
-set +x
+curl -o getEBuilder.xml https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/master/production/testScripts/bootstrap/getEBuilder.xml
 
 set -x
 mkdir -p ${WORKSPACE}/java
@@ -86,7 +82,9 @@ env 1>envVars.txt 2>&1
 ant -diagnostics 1>antDiagnostics.txt 2>&1
 java -XshowSettings -version 1>javaSettings.txt 2>&1
 
-ant -f getEBuilder.xml -Djava.io.tmpdir=${WORKSPACE}/tmp -DbuildId=$buildId  -DeclipseStream=${STREAM} -DEBUILDER_HASH=${EBUILDER_HASH}  -DdownloadURL=https://download.eclipse.org/eclipse/downloads/drops4/${buildId}  -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=ppc64le -DtestSuite=${testsToRun}
+ant -f getEBuilder.xml -Djava.io.tmpdir=${WORKSPACE}/tmp -DbuildId=$buildId \\
+  -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=ppc64le \\
+  -DtestSuite=${testsToRun}
 
 RAW_DATE_END="$(date +%s )"