From 1761bea01928d22fe070fc1acc71e2d04b6badca Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Sat, 30 Nov 2024 13:48:43 +0100 Subject: [PATCH] [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. --- JenkinsJobs/AutomatedTests/I_unit_linux.groovy | 7 ++----- JenkinsJobs/AutomatedTests/I_unit_mac.groovy | 7 ++----- JenkinsJobs/AutomatedTests/I_unit_win32.groovy | 12 ++---------- JenkinsJobs/Builds/I_build.groovy | 2 -- .../PerformanceTests/ILR_perf_lin64.groovy | 9 ++++----- .../ILR_perf_lin64_baseline.groovy | 9 ++++----- .../PerformanceTests/I_perf_lin64.groovy | 9 ++++----- .../I_perf_lin64_baseline.groovy | 9 ++++----- JenkinsJobs/Releng/collectPerfResults.groovy | 3 +-- JenkinsJobs/Releng/collectResults.groovy | 3 +-- JenkinsJobs/SmokeTests/smoke_test_arm64.groovy | 10 ++++------ .../SmokeTests/smoke_test_centos9.groovy | 9 ++++----- .../SmokeTests/smoke_test_opensuse_leap.groovy | 9 ++++----- JenkinsJobs/SmokeTests/smoke_test_ppcle.groovy | 10 ++++------ .../SmokeTests/smoke_test_ubuntu.groovy | 9 ++++----- JenkinsJobs/SmokeTests/smoke_test_win32.groovy | 16 ++++------------ JenkinsJobs/YBuilds/Y_build.groovy | 2 -- .../YBuilds/Y_unit_cen64_gtk3_java17.groovy | 9 ++++----- .../YBuilds/Y_unit_cen64_gtk3_java21.groovy | 9 ++++----- .../YBuilds/Y_unit_cen64_gtk3_java24.groovy | 9 ++++----- JenkinsJobs/YBuilds/Y_unit_mac64_java17.groovy | 10 ++++------ JenkinsJobs/YBuilds/Y_unit_macM1_java17.groovy | 10 ++++------ JenkinsJobs/YBuilds/Y_unit_win32_java17.groovy | 16 ++++------------ .../YBuilds/collectYbuildResults.groovy | 3 +-- .../mbscripts/mb010_createEnvfiles.sh | 1 - cje-production/scripts/collectTestResults.xml | 3 --- production/README.md | 8 ++++---- .../getEBuilder.xml | 18 +++++++++++++++--- scripts/collectResultsLocal.sh | 4 +--- 29 files changed, 93 insertions(+), 142 deletions(-) rename production/testScripts/{hudsonBootstrap => bootstrap}/getEBuilder.xml (79%) diff --git a/JenkinsJobs/AutomatedTests/I_unit_linux.groovy b/JenkinsJobs/AutomatedTests/I_unit_linux.groovy index 762948d7df2..8d3f5995548 100644 --- 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 index b73583c3283..32992465036 100644 --- 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 index a6aa6eab71a..bfcfb2f3429 100644 --- 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 index 5af4c95d449..7773e39a4d2 100644 --- 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 index 587759fb8ff..3f8e4ed6e49 100644 --- 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 index 513bfc5193b..0fb813d4a3f 100644 --- 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 index 81be3023bf9..102da7e45ea 100644 --- 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 index 1bab17be614..09d2a2bf843 100644 --- 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 index 2a486ce3a66..58fc02a3e36 100644 --- a/JenkinsJobs/Releng/collectPerfResults.groovy +++ b/JenkinsJobs/Releng/collectPerfResults.groovy @@ -96,8 +96,7 @@ ssh genie.releng@projects-storage.eclipse.org ${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 index a75a36b7e17..f72ea993a1a 100644 --- a/JenkinsJobs/Releng/collectResults.groovy +++ b/JenkinsJobs/Releng/collectResults.groovy @@ -100,8 +100,7 @@ ssh genie.releng@projects-storage.eclipse.org ${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 index 6708c313db5..51c3b67b68a 100644 --- 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 index da9c64ef7af..bd95395d6d4 100644 --- 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 index db8d759ce26..f4f0267af35 100644 --- 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 index 3d9bbaacda8..1cae29dd506 100644 --- 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 )" diff --git a/JenkinsJobs/SmokeTests/smoke_test_ubuntu.groovy b/JenkinsJobs/SmokeTests/smoke_test_ubuntu.groovy index 6c6ce478331..9f6242174b4 100644 --- a/JenkinsJobs/SmokeTests/smoke_test_ubuntu.groovy +++ b/JenkinsJobs/SmokeTests/smoke_test_ubuntu.groovy @@ -52,10 +52,7 @@ pipeline { # 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 @@ -79,7 +76,9 @@ pipeline { 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_win32.groovy b/JenkinsJobs/SmokeTests/smoke_test_win32.groovy index 48d27cf79b3..462d78a9bb4 100644 --- a/JenkinsJobs/SmokeTests/smoke_test_win32.groovy +++ b/JenkinsJobs/SmokeTests/smoke_test_win32.groovy @@ -101,23 +101,15 @@ rem no -p (or /p) needed on Windows. It creates mkdir tmp rem Note: currently this file always comes from master, no matter what branch is being built/tested. -wget -O getEBuilder.xml --no-verbose https://download.eclipse.org/eclipse/relengScripts/production/testScripts/hudsonBootstrap/getEBuilder.xml 2>&1 +curl -o getEBuilder.xml https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/master/production/testScripts/bootstrap/getEBuilder.xml set buildId -wget -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 -set STREAM -set EBUILDER_HASH set JAVA_HOME=C:\\openjdk\\jdk-11\\ set JAVA_HOME rem set Path="C:\\openjdk\\jdk-11\\bin;C:\\Program Files\\AdoptOpenJDK\\jdk-8.0.202.08\\bin";C:\\ProgramData\\Boxstarter;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C:\\Windows\\System32\\OpenSSH\\;C:\\ProgramData\\chocolatey\\bin;C:\\tools\\cygwin\\bin;C:\\Program Files\\IcedTeaWeb\\WebStart\\bin;C:\\WINDOWS\\system32;C:\\WINDOWS;C:\\WINDOWS\\System32\\Wbem;C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\;C:\\WINDOWS\\System32\\OpenSSH\\;C:\\Users\\jenkins_vnc\\AppData\\Local\\Microsoft\\WindowsApps; -ant -f getEBuilder.xml -Djava.io.tmpdir=%WORKSPACE%\\tmp -Djvm="C:\\\\openjdk\\\\jdk-11\\\\bin\\\\java.exe" -DbuildId=%buildId% -DeclipseStream=%STREAM% -DEBUILDER_HASH=%EBUILDER_HASH% -DdownloadURL="http://download.eclipse.org/eclipse/downloads/drops4/%buildId%" -Dargs=all -Dosgi.os=win32 -Dosgi.ws=win32 -Dosgi.arch=x86_64 -DtestSuite=%testsToRun% - +ant -f getEBuilder.xml -Djava.io.tmpdir=%WORKSPACE%\\tmp -Djvm="C:\\\\openjdk\\\\jdk-11\\\\bin\\\\java.exe" -DbuildId=%buildId% ^ + -Dargs=all -Dosgi.os=win32 -Dosgi.ws=win32 -Dosgi.arch=x86_64 ^ + -DtestSuite=%testsToRun% ''') } diff --git a/JenkinsJobs/YBuilds/Y_build.groovy b/JenkinsJobs/YBuilds/Y_build.groovy index 5b9c55f626c..d2b91a54e69 100644 --- a/JenkinsJobs/YBuilds/Y_build.groovy +++ b/JenkinsJobs/YBuilds/Y_build.groovy @@ -147,7 +147,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) } } @@ -345,7 +344,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/YBuilds/Y_unit_cen64_gtk3_java17.groovy b/JenkinsJobs/YBuilds/Y_unit_cen64_gtk3_java17.groovy index f588cf61c37..d3db15d50fc 100644 --- a/JenkinsJobs/YBuilds/Y_unit_cen64_gtk3_java17.groovy +++ b/JenkinsJobs/YBuilds/Y_unit_cen64_gtk3_java17.groovy @@ -113,10 +113,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 @@ -140,7 +137,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=https://download.eclipse.org/eclipse/downloads/drops4/${buildId} -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 -DtestSuite=all -Djvm=${JAVA_HOME}/bin/java + ant -f getEBuilder.xml -Djava.io.tmpdir=${WORKSPACE}/tmp -DbuildId=$buildId \\ + -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 \\ + -DtestSuite=all -Djvm=${JAVA_HOME}/bin/java RAW_DATE_END="$(date +%s )" diff --git a/JenkinsJobs/YBuilds/Y_unit_cen64_gtk3_java21.groovy b/JenkinsJobs/YBuilds/Y_unit_cen64_gtk3_java21.groovy index 4a18f3e55a3..f433e759025 100644 --- a/JenkinsJobs/YBuilds/Y_unit_cen64_gtk3_java21.groovy +++ b/JenkinsJobs/YBuilds/Y_unit_cen64_gtk3_java21.groovy @@ -113,10 +113,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 @@ -140,7 +137,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=https://download.eclipse.org/eclipse/downloads/drops4/${buildId} -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 -DtestSuite=all -Djvm=${JAVA_HOME}/bin/java + ant -f getEBuilder.xml -Djava.io.tmpdir=${WORKSPACE}/tmp -DbuildId=$buildId \\ + -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 \\ + -DtestSuite=all -Djvm=${JAVA_HOME}/bin/java RAW_DATE_END="$(date +%s )" diff --git a/JenkinsJobs/YBuilds/Y_unit_cen64_gtk3_java24.groovy b/JenkinsJobs/YBuilds/Y_unit_cen64_gtk3_java24.groovy index 977cf4e7d41..28b32b552b7 100644 --- a/JenkinsJobs/YBuilds/Y_unit_cen64_gtk3_java24.groovy +++ b/JenkinsJobs/YBuilds/Y_unit_cen64_gtk3_java24.groovy @@ -113,10 +113,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 @@ -140,7 +137,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=https://download.eclipse.org/eclipse/downloads/drops4/${buildId} -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 -DtestSuite=all -Djvm=${JAVA_HOME}/bin/java + ant -f getEBuilder.xml -Djava.io.tmpdir=${WORKSPACE}/tmp -DbuildId=$buildId \\ + -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 \\ + -DtestSuite=all -Djvm=${JAVA_HOME}/bin/java RAW_DATE_END="$(date +%s )" diff --git a/JenkinsJobs/YBuilds/Y_unit_mac64_java17.groovy b/JenkinsJobs/YBuilds/Y_unit_mac64_java17.groovy index 1e3775fbec4..09ddc0a99c2 100644 --- a/JenkinsJobs/YBuilds/Y_unit_mac64_java17.groovy +++ b/JenkinsJobs/YBuilds/Y_unit_mac64_java17.groovy @@ -101,11 +101,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 2>&1 -cat getEBuilder.xml -curl -o buildProperties.sh https://download.eclipse.org/eclipse/downloads/drops4/$buildId/buildproperties.shsource -cat getEBuilder.xml -source buildProperties.sh +curl -o getEBuilder.xml https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/master/production/testScripts/bootstrap/getEBuilder.xml export JAVA_HOME=/Library/Java/JavaVirtualMachines/temurin-17.jdk/Contents/Home export ANT_HOME=/opt/homebrew/Cellar/ant/1.10.11/libexec @@ -121,7 +117,9 @@ ant -diagnostics 1>antDiagnostics.txt 2>&1 java -XshowSettings -version 1>javaSettings.txt 2>&1 export eclipseArch=x86_64 -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=macosx -Dosgi.ws=cocoa -Dosgi.arch=x86_64 -DtestSuite=${testSuite} +ant -f getEBuilder.xml -Djava.io.tmpdir=${WORKSPACE}/tmp -DbuildId=$buildId \\ + -Dosgi.os=macosx -Dosgi.ws=cocoa -Dosgi.arch=x86_64 \\ + -DtestSuite=${testSuite} RAW_DATE_END="$(date +%s )" diff --git a/JenkinsJobs/YBuilds/Y_unit_macM1_java17.groovy b/JenkinsJobs/YBuilds/Y_unit_macM1_java17.groovy index c19a01e7187..a2dff53f0e7 100644 --- a/JenkinsJobs/YBuilds/Y_unit_macM1_java17.groovy +++ b/JenkinsJobs/YBuilds/Y_unit_macM1_java17.groovy @@ -99,11 +99,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 2>&1 -cat getEBuilder.xml -curl -o buildProperties.sh https://download.eclipse.org/eclipse/downloads/drops4/$buildId/buildproperties.shsource -cat getEBuilder.xml -source buildProperties.sh +curl -o getEBuilder.xml https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/master/production/testScripts/bootstrap/getEBuilder.xml export JAVA_HOME=/usr/local/openjdk-17/Contents/Home export ANT_HOME=/opt/homebrew/Cellar/ant/1.10.11/libexec @@ -120,7 +116,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=macosx -Dosgi.ws=cocoa -Dosgi.arch=aarch64 -DtestSuite=${testSuite} +ant -f getEBuilder.xml -Djava.io.tmpdir=${WORKSPACE}/tmp -DbuildId=$buildId \\ + -Dosgi.os=macosx -Dosgi.ws=cocoa -Dosgi.arch=aarch64 \\ + -DtestSuite=${testSuite} RAW_DATE_END="$(date +%s )" diff --git a/JenkinsJobs/YBuilds/Y_unit_win32_java17.groovy b/JenkinsJobs/YBuilds/Y_unit_win32_java17.groovy index 81b7a5117f6..3b03c803428 100644 --- a/JenkinsJobs/YBuilds/Y_unit_win32_java17.groovy +++ b/JenkinsJobs/YBuilds/Y_unit_win32_java17.groovy @@ -102,23 +102,15 @@ rem no -p (or /p) needed on Windows. It creates mkdir tmp rem Note: currently this file always comes from master, no matter what branch is being built/tested. -wget -O getEBuilder.xml --no-verbose https://download.eclipse.org/eclipse/relengScripts/production/testScripts/hudsonBootstrap/getEBuilder.xml 2>&1 +curl -o getEBuilder.xml https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/master/production/testScripts/bootstrap/getEBuilder.xml set buildId -wget -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 -set STREAM -set EBUILDER_HASH set JAVA_HOME="C:\\PROGRA~1\\ECLIPS~1\\jdk-17.0.5.8-hotspot\\" set JAVA_HOME set Path="C:\\PROGRA~1\\ECLIPS~1\\jdk-17.0.5.8-hotspot\\bin";C:\\ProgramData\\Boxstarter;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\;C:\\Windows\\System32\\OpenSSH\\;C:\\ProgramData\\chocolatey\\bin;C:\\tools\\cygwin\\bin;C:\\Program Files\\IcedTeaWeb\\WebStart\\bin;C:\\WINDOWS\\system32;C:\\WINDOWS;C:\\WINDOWS\\System32\\Wbem;C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\;C:\\WINDOWS\\System32\\OpenSSH\\;C:\\Users\\jenkins_vnc\\AppData\\Local\\Microsoft\\WindowsApps;%PATH% -ant -f getEBuilder.xml -Djava.io.tmpdir=%WORKSPACE%\\tmp -Djvm="C:\\PROGRA~1\\ECLIPS~1\\jdk-17.0.5.8-hotspot\\bin\\java.exe" -DbuildId=%buildId% -DeclipseStream=%STREAM% -DEBUILDER_HASH=%EBUILDER_HASH% -DdownloadURL="https://download.eclipse.org/eclipse/downloads/drops4/%buildId%" -Dargs=all -Dosgi.os=win32 -Dosgi.ws=win32 -Dosgi.arch=x86_64 -DtestSuite=all - +ant -f getEBuilder.xml -Djava.io.tmpdir=%WORKSPACE%\\tmp -Djvm="C:\\PROGRA~1\\ECLIPS~1\\jdk-17.0.5.8-hotspot\\bin\\java.exe" -DbuildId=%buildId% ^ + -Dargs=all -Dosgi.os=win32 -Dosgi.ws=win32 -Dosgi.arch=x86_64 ^ + -DtestSuite=all ''') } diff --git a/JenkinsJobs/YBuilds/collectYbuildResults.groovy b/JenkinsJobs/YBuilds/collectYbuildResults.groovy index cc5a93b3ecc..c15292e6552 100644 --- a/JenkinsJobs/YBuilds/collectYbuildResults.groovy +++ b/JenkinsJobs/YBuilds/collectYbuildResults.groovy @@ -101,8 +101,7 @@ ssh genie.releng@projects-storage.eclipse.org ${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/cje-production/mbscripts/mb010_createEnvfiles.sh b/cje-production/mbscripts/mb010_createEnvfiles.sh index 28de39e1a96..1a4cb0df12f 100755 --- a/cje-production/mbscripts/mb010_createEnvfiles.sh +++ b/cje-production/mbscripts/mb010_createEnvfiles.sh @@ -74,7 +74,6 @@ fn-addToPropFiles BUILD_ENV_FILE_PROP "\"$BUILD_ENV_FILE_PROP\"" fn-addToPropFiles BUILD_ID "\"$BUILD_TYPE$TIMESTAMP\"" fn-addToPropFiles BUILD_DIR_SEG "\"$BUILD_TYPE$TIMESTAMP\"" fn-addToPropFiles EQ_BUILD_DIR_SEG "\"$BUILD_TYPE$TIMESTAMP\"" -fn-addToPropFiles EBUILDER_HASH "\"$(git show-ref --hash --verify refs/remotes/origin/${BRANCH})\"" fn-addToPropFiles ECLIPSE_BUILDER_DIR "\"$CJE_ROOT/$AGG_DIR/eclipse.platform.releng.tychoeclipsebuilder\"" fn-addToPropFiles PLATFORM_PRODUCTS_DIR "\"$CJE_ROOT/$AGG_DIR/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/products\"" fn-addToPropFiles PLATFORM_REPO_DIR "\"$CJE_ROOT/$AGG_DIR/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository\"" diff --git a/cje-production/scripts/collectTestResults.xml b/cje-production/scripts/collectTestResults.xml index 6477f7ed94f..5a1157566a1 100644 --- a/cje-production/scripts/collectTestResults.xml +++ b/cje-production/scripts/collectTestResults.xml @@ -11,9 +11,6 @@ - &1 + curl -o getEBuilder.xml https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/master/production/testScripts/bootstrap/getEBuilder.xml ``` * Make sure you have ant installed so you can run the following command: ``` - 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 ``` -The current process uses [getEBuilder.xml](testScripts/hudsonBootstrap/getEBuilder.xml) to download a pre-zipped version of the testScripts folder then calls [runTests2.xml](testScripts/runTests2.xml). +The current process uses [getEBuilder.xml](testScripts/bootstrap/getEBuilder.xml) to download the testScripts folder then calls [runTests2.xml](testScripts/runTests2.xml). runTests2.xml downloads the installer for the build being tested and the zip of the tests being run, then runs them. diff --git a/production/testScripts/hudsonBootstrap/getEBuilder.xml b/production/testScripts/bootstrap/getEBuilder.xml similarity index 79% rename from production/testScripts/hudsonBootstrap/getEBuilder.xml rename to production/testScripts/bootstrap/getEBuilder.xml index 7ca4f2c14b8..71dd3d2da5f 100644 --- a/production/testScripts/hudsonBootstrap/getEBuilder.xml +++ b/production/testScripts/bootstrap/getEBuilder.xml @@ -6,8 +6,7 @@ Such as, start with a wget fetch from CGit (where following $dash; is literally a '-', it is escaped here just for XML rules against two dashes in a comment); - wget -O getEBuilder.xml ‐‐no-verbose https://download.eclipse.org/eclipse/relengScripts/production/testScripts/hudsonBootstrap/getEBuilder.xml - 2>&1 + curl -o getEBuilder.xml https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/master/production/testScripts/bootstrap/getEBuilder.xml Then use ant to invoke the functionality. Example: @@ -77,6 +76,10 @@ + + + + @@ -95,7 +98,7 @@ - + @@ -103,5 +106,14 @@ + + + + \ No newline at end of file diff --git a/scripts/collectResultsLocal.sh b/scripts/collectResultsLocal.sh index 557640ddd81..8252ef7a101 100755 --- a/scripts/collectResultsLocal.sh +++ b/scripts/collectResultsLocal.sh @@ -95,9 +95,7 @@ java -jar ${launcherJar} -nosplash -consolelog -debug -data $devworkspace -appli -DpostingDirectory=${postingDirectory} \ -Djob=${triggeringJob} \ -DbuildURL=${buildURL} \ - -DbuildID=${buildID} \ - -DEBUILDER_HASH=${EBUILDER_HASH} - + -DbuildID=${buildID} devworkspace=${workspace}/workspace-updateTestResults