Skip to content

Commit e89f961

Browse files
HannesWellHannesWell
committed
[I/Y-Build] Replace base-builder installation with tycho eclipse-run
Replace creation and use of a base-builder Eclispe installation, by invocations of the 'eclipse-run' goal of the tycho-eclipse Maven plugin. Also remove unused eclipserun-repo property.
1 parent cb180c3 commit e89f961

6 files changed

Lines changed: 52 additions & 43 deletions

File tree

‎JenkinsJobs/Builds/build.jenkinsfile‎

Lines changed: 15 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -174,25 +174,6 @@ pipeline {
174174
}
175175
}
176176
}
177-
stage('Create base builder'){
178-
steps {
179-
script{
180-
def eclipsePlatformLatestRelease = "https://download.eclipse.org/eclipse/downloads/drops4/${PREVIOUS_RELEASE_ID}/eclipse-platform-${PREVIOUS_RELEASE_VER}-linux-gtk-x86_64.tar.gz"
181-
def exe = utilities.installDownloadableTool('eclipse', eclipsePlatformLatestRelease) + '/eclipse'
182-
assignEnvVariable('BASE_BUILDER_ECLIPSE_EXE', "${exe} -nosplash --launcher.suppressErrors")
183-
sh '''
184-
source $CJE_ROOT/buildproperties.shsource
185-
mkdir -p $CJE_ROOT/$TMP_DIR
186-
$BASE_BUILDER_ECLIPSE_EXE \
187-
-debug -consolelog -data $CJE_ROOT/$TMP_DIR/workspace-toolsinstall \
188-
-application org.eclipse.equinox.p2.director \
189-
-repository ${ECLIPSE_RUN_REPO},https://download.eclipse.org/cbi/updates/p2-analyzers/tools/nightly/latest \
190-
-installIU org.eclipse.pde.api.tools,org.eclipse.cbi.p2repo.analyzers.feature.feature.group \
191-
-profile SDKProfile
192-
'''
193-
}
194-
}
195-
}
196177
stage('Aggregator maven build') {
197178
environment {
198179
KEYRING = credentials('secret-subkeys-releng.asc')
@@ -203,6 +184,7 @@ pipeline {
203184
dir("${AGG_DIR}") {
204185
sh '''#!/bin/bash -xe
205186
source $CJE_ROOT/buildproperties.shsource
187+
mkdir -p ${CJE_ROOT}/${TMP_DIR}
206188

207189
mvn clean install -pl :eclipse-sdk-prereqs,:org.eclipse.jdt.core.compiler.batch \
208190
-Dmaven.repo.local=${LOCAL_REPO} -DlocalEcjVersion=99.99 \
@@ -370,19 +352,22 @@ pipeline {
370352
popd
371353

372354
# Generate repository reports
373-
$BASE_BUILDER_ECLIPSE_EXE \
374-
-application org.eclipse.cbi.p2repo.analyzers.repoReport \
375-
-data $CJE_ROOT/$TMP_DIR/workspace-report -vmargs -Xmx1g \
376-
-DreferenceRepo=https://download.eclipse.org/eclipse/updates/${PREVIOUS_RELEASE_REPO_ID}/${BASEBUILD_ID} \
377-
-DreportRepoDir=${PLATFORM_REPO_DIR} \
378-
-DreportOutputDir=${DROP_DIR}/${BUILD_ID}/buildlogs
355+
mvn tycho-eclipse:eclipse-run@run-eclipse -f eclipse-platform-parent \
356+
-Declipserun.feature=org.eclipse.cbi.p2repo.analyzers.feature.feature.group \
357+
-Declipserun.workArea=${CJE_ROOT}/${TMP_DIR}/repo-report \
358+
-Declipserun.appArgs='-application org.eclipse.cbi.p2repo.analyzers.repoReport' \
359+
-Declipserun.vmArgs=" \
360+
-DreferenceRepo=https://download.eclipse.org/eclipse/updates/${PREVIOUS_RELEASE_REPO_ID}/${BASEBUILD_ID} \
361+
-DreportRepoDir=${PLATFORM_REPO_DIR} -DreportOutputDir=${DROP_DIR}/${BUILD_ID}/buildlogs \
362+
"
379363

380364
# Generate API-tools reports
381-
pushd ${DROP_DIR}/${BUILD_ID}
382-
$BASE_BUILDER_ECLIPSE_EXE \
365+
mvn tycho-eclipse:eclipse-run@run-eclipse -f eclipse-platform-parent \
366+
-Declipserun.feature=org.eclipse.cbi.p2repo.analyzers.feature.feature.group \
367+
-Declipserun.workArea=${CJE_ROOT}/${TMP_DIR}/apitoolings-logs \
368+
-Declipserun.appArgs="\
383369
-application org.eclipse.ant.core.antRunner \
384370
-buildfile $ECLIPSE_BUILDER_DIR/eclipse/buildScripts/api-tools-builder.xml \
385-
-data $CJE_ROOT/$TMP_DIR/workspace-apitoolingsLogs \
386371
-DEBuilderDir=$ECLIPSE_BUILDER_DIR \
387372
-DbuildDirectory=${DROP_DIR}/${BUILD_ID} \
388373
-DbuildId=$BUILD_ID \
@@ -393,7 +378,7 @@ pipeline {
393378
-DpreviousBaselineFilename=eclipse-SDK-$PREVIOUS_RELEASE_VER-win32-x86_64.zip \
394379
-Djava.io.tmpdir=$CJE_ROOT/$TMP_DIR \
395380
apiToolsReports
396-
popd
381+
"
397382
rm -rf ${DROP_DIR}/${BUILD_ID}/apitoolingreference
398383

399384
# Wait for notarization to complete before checksums are generated.
@@ -482,6 +467,7 @@ pipeline {
482467
# Build Equinox Launcher archives
483468
pushd $CJE_ROOT
484469
mkdir -p $ECLIPSE_BUILDER_DIR/equinox/$TMP_DIR
470+
#FIXME: Replace this too!!
485471
$BASE_BUILDER_ECLIPSE_EXE \
486472
-application org.eclipse.ant.core.antRunner \
487473
-buildfile ${ECLIPSE_BUILDER_DIR}/equinox/buildConfigs/equinox-launchers/build.xml \

‎JenkinsJobs/Releng/prepareNextDevCycle.jenkinsfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ pipeline {
157157
"STREAM=\".*\"" : "STREAM=\"${NEXT_RELEASE_VERSION}.0\"",
158158
"STREAMMajor=\".*\"" : "STREAMMajor=\"${NEXT_RELEASE_VERSION_MAJOR}\"",
159159
"STREAMMinor=\".*\"" : "STREAMMinor=\"${NEXT_RELEASE_VERSION_MINOR}\"",
160-
"ECLIPSE_RUN_REPO=\".*\"" : "ECLIPSE_RUN_REPO=\"https://download.eclipse.org/eclipse/updates/${NEXT_RELEASE_VERSION}-I-builds/\"",
161160
"NEXT_JAVA_RELEASE_DATE=\".*\"" : "NEXT_JAVA_RELEASE_DATE=\"${NEXT_JAVA_RELEASE_DATE}\"",
162161
])
163162
replaceInFile('products/eclipse-platform/platform.p2.inf', [

‎JenkinsJobs/Releng/promoteBuild.jenkinsfile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,6 @@ pipeline {
255255
-DnewPrevious-release.baseline="${RELEASE_P2_REPOSITORY}" \
256256
-DnewCbi-ecj-version="${ecjVersion}"
257257
"""
258-
utilities.replaceAllInFile('cje-production/buildproperties.txt', [
259-
'ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/.*"' : "ECLIPSE_RUN_REPO=\"${RELEASE_P2_REPOSITORY}\"",
260-
])
261258
utilities.gitCommitAllExcludingSubmodules("Update ${MAINTENANCE_BRANCH} branch with release version for ${BUILD_MAJOR}_${BUILD_MINOR}+ changes")
262259
}
263260
// Switch back to master for subsequent parts of this pipeline

‎cje-production/buildproperties.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,3 @@ PREVIOUS_RELEASE_REPO_ID="4.39"
3232
BASEBUILD_ID="R-4.39-202602260420"
3333
#release id for downloading eclipse
3434
PREVIOUS_RELEASE_ID="R-4.39-202602260420"
35-
36-
ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.40-I-builds/"

‎eclipse-platform-parent/pom.xml‎

Lines changed: 36 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,6 @@
7272

7373
<eclipse-sdk-repo>https://download.eclipse.org/eclipse/updates/${releaseVersion}-I-builds/</eclipse-sdk-repo>
7474

75-
<!--
76-
The tycho-eclipserun-plugin will create its instance of Eclipse from this
77-
'eclipiserun-repo' repository, such as for computing .api-descriptions and
78-
generating API Tools reports.
79-
-->
80-
<eclipserun-repo>${eclipse-sdk-repo}</eclipserun-repo>
81-
8275
<comparator.repo>${eclipse-sdk-repo}</comparator.repo>
8376

8477
<!-- only used when Tycho snapshot repo is enabled in <pluginRepositories> further down -->
@@ -507,6 +500,42 @@
507500
<artifactId>tycho-gpg-plugin</artifactId>
508501
<version>${tycho.version}</version>
509502
</plugin>
503+
<plugin>
504+
<groupId>org.eclipse.tycho</groupId>
505+
<artifactId>tycho-eclipse-plugin</artifactId>
506+
<version>${tycho.version}</version>
507+
<executions>
508+
<execution>
509+
<id>run-eclipse</id>
510+
<goals>
511+
<goal>eclipse-run</goal>
512+
</goals>
513+
<configuration>
514+
<appArgLine>${eclipserun.appArgs}</appArgLine>
515+
<argLine>${eclipserun.vmArgs}</argLine>
516+
<work>${eclipserun.workArea}</work>
517+
<dependencies>
518+
<dependency>
519+
<artifactId>${eclipserun.feature}</artifactId>
520+
<type>p2-installable-unit</type>
521+
</dependency>
522+
</dependencies>
523+
<repositories>
524+
<repository>
525+
<id>eclipse</id>
526+
<layout>p2</layout>
527+
<url>${eclipse-sdk-repo}</url>
528+
</repository>
529+
<repository>
530+
<id>cbi.p2repo.analyzer</id>
531+
<layout>p2</layout>
532+
<url>https://download.eclipse.org/cbi/updates/p2-analyzers/tools/nightly/latest</url>
533+
</repository>
534+
</repositories>
535+
</configuration>
536+
</execution>
537+
</executions>
538+
</plugin>
510539
<plugin>
511540
<groupId>org.eclipse.tycho</groupId>
512541
<artifactId>tycho-versions-plugin</artifactId>

‎eclipse-platform-parent/saveproperties/mavenproperties.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ tycho.localArtifacts=${tycho.localArtifacts}
66
tycho.version=${tycho.version}
77
cbi-ecj-version=${cbi-ecj-version}
88
cbi-plugins.version=${cbi-plugins.version}
9-
eclipserun-repo=${eclipserun-repo}
9+
ECLIPSE_RUN_REPO=${eclipse-sdk-repo}
1010

1111
java.class.path=${java.class.path}
1212
java.class.version=${java.class.version}

0 commit comments

Comments
 (0)