[I/Y-Build] Inline scripts for Eclipse base-builder and report creation

Also use the same Eclipse installation to generate the repository and
API report and don't create a separate installation from the one fetched
from the download server.

This avoids the need to maintain the simple eclipse invocations in
separate files and thus simplifies the pipeline.

Author: HannesWell

.gitignore

@@ -9,6 +9,7 @@ workspace/
 RemoteSystemsTempFiles/
 /apiAnalyzer-workspace/
 eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/samples/*/doc-html
+/tools/
 
 # Maven/Tycho build artifats
 target/

JenkinsJobs/Builds/build.jenkinsfile

@@ -61,6 +61,8 @@ pipeline {
 					assignEnvVariable('TEST_CONFIGURATIONS_EXPECTED', BUILD.tests.collect{ c ->
 						"${TEST_NAME_PREFIX}-${c.os}-${c.arch}-java${c.javaVersion}_${c.os}.${c.ws}.${c.arch}_${c.javaVersion}"
 					}.join(','))
+					
+					utilities = load 'JenkinsJobs/shared/utilities.groovy'
 				}
 				dir("${CJE_ROOT}") {
 					sh '''#!/bin/bash -xe
@@ -73,6 +75,7 @@ pipeline {
 				exportPropertiesAsEnvironmentVariables("${CJE_ROOT}/buildproperties.properties", [
 					'BUILD_ID',
 					'STREAM', 'RELEASE_VER',
+					'PREVIOUS_RELEASE_ID', 'PREVIOUS_RELEASE_VER',
 				])
 			}
 		}
@@ -191,14 +194,21 @@ pipeline {
 				}
 			}
 		}
-	  stage('Create Base builder'){
-          steps {
-				dir("${CJE_ROOT}/mbscripts") {
-		      sshagent(['projects-storage.eclipse.org-bot-ssh']) {
-		                sh '''#!/bin/bash -xe
-		                    ./mb020_createBaseBuilder.sh $CJE_ROOT/buildproperties.shsource 2>&1
-		                '''
-		        }
+		stage('Create base builder'){
+			steps {
+				script{
+					def eclipsePlatformLatestRelease = "https://download.eclipse.org/eclipse/downloads/drops4/${PREVIOUS_RELEASE_ID}/eclipse-platform-${PREVIOUS_RELEASE_VER}-linux-gtk-x86_64.tar.gz"
+					def exe = utilities.installDownloadableTool('eclipse', eclipsePlatformLatestRelease) + '/eclipse'
+					assignEnvVariable('BASE_BUILDER_ECLIPSE_EXE', "${exe} -nosplash --launcher.suppressErrors")
+					sh '''
+						source $CJE_ROOT/buildproperties.shsource
+						$BASE_BUILDER_ECLIPSE_EXE \
+							-debug -consolelog -data $CJE_ROOT/$TMP_DIR/workspace-toolsinstall \
+							-application org.eclipse.equinox.p2.director \
+							-repository ${ECLIPSE_RUN_REPO},${BUILDTOOLS_REPO},https://download.eclipse.org/cbi/updates/p2-analyzers/products/nightly/latest \
+							-installIU org.eclipse.pde.api.tools,org.eclipse.releng.build.tools.feature.feature.group,org.eclipse.cbi.p2repo.analyzers \
+							-profile SDKProfile
+					'''
 				}
 			}
 		}
@@ -252,7 +262,7 @@ pipeline {
 					cp ${logDir}/mb220_buildSdkPatch.sh.log $CJE_ROOT/$DROP_DIR/$BUILD_ID/buildlogs/mb060_run-maven-build_output.txt
 
 					pushd $CJE_ROOT/$DROP_DIR/$BUILD_ID
-					java -jar $LAUNCHER_JAR \
+					$BASE_BUILDER_ECLIPSE_EXE \
 						-application org.eclipse.ant.core.antRunner \
 						-buildfile $ECLIPSE_BUILDER_DIR/eclipse/buildScripts/eclipse_compare.xml \
 						-data $CJE_ROOT/$TMP_DIR/workspace-comparatorLogs \
@@ -297,21 +307,39 @@ pipeline {
 						}
 						stage('Generate Repo reports') {
 							steps {
-								dir("${CJE_ROOT}/mbscripts") {
-									sh '''#!/bin/bash -xe
-										./mb500_createRepoReports.sh $CJE_ROOT/buildproperties.shsource 2>&1
-									'''
-								}
+								sh '''#!/bin/bash -xe
+									source $CJE_ROOT/buildproperties.shsource
+									$BASE_BUILDER_ECLIPSE_EXE \
+										-application org.eclipse.cbi.p2repo.analyzers.repoReport \
+										-data $CJE_ROOT/$TMP_DIR/workspace-report -vmargs -Xmx1g \
+										-DreferenceRepo=$CJE_ROOT/$TMP_DIR/$BUILD_TO_COMPARE_SITE/$PREVIOUS_RELEASE_VER/$BASEBUILD_ID \
+										-DreportRepoDir=${PLATFORM_REPO_DIR} \
+										-DreportOutputDir=${CJE_ROOT}/${DROP_DIR}/${BUILD_ID}/buildlogs
+								'''
 							}
 						}
 						stage('Generate API tools reports') {
 							steps {
-								dir("${CJE_ROOT}/mbscripts") {
-									sh '''#!/bin/bash -xe
-										./mb510_createApiToolsReports.sh $CJE_ROOT/buildproperties.shsource 2>&1
-										rm -rf $CJE_ROOT/$DROP_DIR/$BUILD_ID/apitoolingreference
-									'''
-								}
+								sh '''#!/bin/bash -xe
+									source $CJE_ROOT/buildproperties.shsource
+									pushd $CJE_ROOT/$DROP_DIR/$BUILD_ID
+									$BASE_BUILDER_ECLIPSE_EXE \
+										-application org.eclipse.ant.core.antRunner \
+										-buildfile $ECLIPSE_BUILDER_DIR/eclipse/buildScripts/api-tools-builder.xml \
+										-data $CJE_ROOT/$TMP_DIR/workspace-apitoolingsLogs \
+										-DEBuilderDir=$ECLIPSE_BUILDER_DIR \
+										-DbuildDirectory=$CJE_ROOT/$DROP_DIR/$BUILD_ID \
+										-DbuildId=$BUILD_ID \
+										-DbuildLabel=$BUILD_ID \
+										-DbuildWorkingArea=$CJE_ROOT/$AGG_DIR \
+										-DpreviousBaseURL=https://$DOWNLOAD_HOST/eclipse/downloads/drops4/$PREVIOUS_RELEASE_ID/eclipse-SDK-$PREVIOUS_RELEASE_VER-win32-x86_64.zip \
+										-DpreviousBaselineName=Eclipse-SDK-$PREVIOUS_RELEASE_VER \
+										-DpreviousBaselineFilename=eclipse-SDK-$PREVIOUS_RELEASE_VER-win32-x86_64.zip \
+										-Djava.io.tmpdir=$CJE_ROOT/$TMP_DIR \
+										apiToolsReports
+									popd
+									rm -rf $CJE_ROOT/$DROP_DIR/$BUILD_ID/apitoolingreference
+								'''
 							}
 						}
 						stage('Promote Eclipse platform') {
@@ -481,6 +509,9 @@ pipeline {
 	}
 }
 
+@groovy.transform.Field
+def utilities = null
+
 @NonCPS
 def assignEnvVariable(String name, String value) {
 	env[name] = value

cje-production/buildproperties.txt

@@ -40,6 +40,4 @@ BASEBUILD_ID="I20251126-2330"
 PREVIOUS_RELEASE_ID="S-4.38RC2-202511262330"
 
 BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/snapshots"
-WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.37.0/R-3.37.0-20250303081219/repositoryunittests/"
-BASEBUILDER_DIR="tmp/org.eclipse.releng.basebuilder"
 ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.39-I-builds/"

cje-production/mbscripts/mb020_createBaseBuilder.sh

@@ -24,8 +24,6 @@ source $1
 
 mkdir -p $CJE_ROOT/$DROP_DIR/$BUILD_ID/testresults/consolelogs
 
-JavaCMD=${JAVA_HOME}/bin/java
-
 # gather repo
 REPO_ZIP=$PLATFORM_TARGET_DIR/eclipse.platform.repository-${STREAMMajor}.${STREAMMinor}.${STREAMService}-SNAPSHOT.zip
 
@@ -94,7 +92,7 @@ fi
   ANT_SCRIPT=$ECLIPSE_BUILDER_DIR/repos/platformrepo.xml
   if [ -d $PLATFORM_REPO_DIR ]; then
     pushd $PLATFORM_REPO_DIR
-    java -jar $LAUNCHER_JAR \
+    $BASE_BUILDER_ECLIPSE_EXE \
       -application org.eclipse.ant.core.antRunner \
       -buildfile $ANT_SCRIPT \
       -data $CJE_ROOT/$TMP_DIR/workspace-buildrepos \
@@ -158,7 +156,7 @@ fi
 # verify compilelog
 pushd $CJE_ROOT/$DROP_DIR/$BUILD_ID
 ANT_SCRIPT=$ECLIPSE_BUILDER_DIR/eclipse/helper.xml
-$JavaCMD -jar $LAUNCHER_JAR \
+$BASE_BUILDER_ECLIPSE_EXE \
   -application org.eclipse.ant.core.antRunner \
   -buildfile $ANT_SCRIPT \
   -data $CJE_ROOT/$TMP_DIR/workspace-verifyCompile \
@@ -185,7 +183,7 @@ fi
 # publish Eclipse
 pushd $CJE_ROOT
 ANT_SCRIPT=$ECLIPSE_BUILDER_DIR/eclipse/helper.xml
-$JavaCMD -jar $LAUNCHER_JAR \
+$BASE_BUILDER_ECLIPSE_EXE \
   -application org.eclipse.ant.core.antRunner \
   -buildfile $ANT_SCRIPT \
   -data $CJE_ROOT/$TMP_DIR/workspace-publish \
@@ -199,7 +197,6 @@ $JavaCMD -jar $LAUNCHER_JAR \
   -DbuildType=$BUILD_TYPE \
   -DpublishingContent=$ECLIPSE_BUILDER_DIR/eclipse/publishingFiles \
   -DindexFileName=index.php \
-  -Dbase.builder=$CJE_ROOT/$BASEBUILDER_DIR \
   -Djava.io.tmpdir=$CJE_ROOT/$TMP_DIR \
   -v \
   publish

cje-production/mbscripts/mb300_gatherEclipseParts.sh

@@ -69,7 +69,7 @@ fi
 pushd $CJE_ROOT
 mkdir -p $ECLIPSE_BUILDER_DIR/equinox/$TMP_DIR
 ANT_SCRIPT=$ECLIPSE_BUILDER_DIR/equinox/helper.xml
-${JAVA_HOME}/bin/java -jar $LAUNCHER_JAR \
+$BASE_BUILDER_ECLIPSE_EXE \
   -application org.eclipse.ant.core.antRunner \
   -buildfile $ANT_SCRIPT \
   -data $CJE_ROOT/$TMP_DIR/workspace-publishEquinox \
@@ -84,7 +84,6 @@ ${JAVA_HOME}/bin/java -jar $LAUNCHER_JAR \
   -DeqpublishingContent=$ECLIPSE_BUILDER_DIR/equinox/publishingFiles \
   -DindexFileName=index.php \
   -Dequinox.build.configs=$ECLIPSE_BUILDER_DIR/equinox/buildConfigs \
-  -Dbase.builder=$CJE_ROOT/$BASEBUILDER_DIR \
   -Djava.io.tmpdir=$CJE_ROOT/$TMP_DIR \
   -v \
   publish