Skip to content

Commit 162f2bb

Browse files
committed
[Build] Use last successful ECJ snapshot in verification builds
Use the latest ECJ snapshot version from the last successful I-build (without comparator errors) for verification builds, to automatically align with I-builds. Currently ECJ has to be deployed manually to a JDT snapshot-repository after changes in ECJ that caused comparator errors. This change makes that JDT snapshot repository is obsolete.
1 parent 5b1f97f commit 162f2bb

File tree

4 files changed

+20
-22
lines changed

4 files changed

+20
-22
lines changed

JenkinsJobs/Builds/I_build.groovy

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,11 @@ spec:
428428
}
429429
}
430430
stage('Trigger publication to Maven snapshots repo') {
431+
when {
432+
environment name: 'COMPARATOR_ERRORS_SUBJECT', value: ''
433+
// On comparator-erros, skip the deployment of snapshot version to the 'eclipse-snapshots' maven repository to prevent that ECJ snapshot
434+
// from being used in verification builds. Similar to how the p2-repository is not added to the I-build composite in that case.
435+
}
431436
steps {
432437
container('jnlp') {
433438
build job: 'CBIaggregator', parameters: [string(name: 'snapshotOrRelease', value: '-snapshot')], wait: false

RELEASE.md

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,6 @@
5858
- Use the mail template from the promotion build [artifacts](https://ci.eclipse.org/releng/job/eclipse.releng.renameAndPromote/lastSuccessfulBuild/artifact/) in Jenkins to get the download urls.
5959
- Make sure to mention that the Master branch is now again open for development.
6060
* For **Milestone builds** return the I-builds to the normal schedule.
61-
* **Update ECJ compiler** in the platform build (if it needs to be updated).
62-
* To find the new compiler version:
63-
- Go to the update site for the release candidate
64-
- Click `plugins`
65-
- Find `org.eclipse.jdt.core.complier.batch_${ecjversion}.jar`
66-
* Edit the [copyAndDeployJDTCompiler](https://ci.eclipse.org/jdt/job/copyAndDeployJDTCompiler) job in Jenkins
67-
- Only JDT committers can run the job, but Releng/Platform committers can configure it
68-
- Update the default values of the `versionfolder`, `buildid` and `ecjversion` parameters.
69-
- Update the build triggers to schedule a build for the current date.
70-
* Finally update the `cbi-ecj-version` in [eclipse.platform.releng.aggregator/eclipse-platform-parent/pom.xml](https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/master/eclipse-platform-parent/pom.xml)
7161
* **After RC1**
7262
* Leave the I-builds running on the milestone schedule for RC2.
7363
* Comment on EMF, ECF and Orbit issues to ask for final release builds.
@@ -214,6 +204,13 @@ The release is scheduled for 10AM EST. Typically the jobs are scheduled beforeha
214204
- Update the previousReleaseVersion in [eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties](eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties)
215205
- Update the name of the copied files in [eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh](eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh)
216206
- Update baselineCode in [production/testScripts/updateTestResultsPages.sh](production/testScripts/updateTestResultsPages.sh)
207+
**Update ECJ compiler** in the platform build (if it needs to be updated).
208+
- To find the new compiler version (usually it's the previous minor version incremented by one):
209+
- Go to the update site of the new I-build repository
210+
- Click `plugins`
211+
- Find `org.eclipse.jdt.core.complier.batch_${ecjversion}.jar`
212+
- Finally update the `cbi-ecj-version` in [eclipse.platform.releng.aggregator/eclipse-platform-parent/pom.xml](https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/master/eclipse-platform-parent/pom.xml)
213+
217214
**General Cleanup**
218215
- In [eclipse.platform.common] search for and clear out all of the forceQualifierUpdate.txt files.
219216
The context here is that the doc builds only check for changes in this repo and so these files need to be changed to trigger a full rebuild.

cje-production/mbscripts/mb300_gatherEclipseParts.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ then
286286
fn-write-property COMPARATOR_ERRORS_BODY "\"Check unanticipated comparator messages:<br> <a href='https://download.eclipse.org/eclipse/downloads/drops4/${BUILD_ID}/buildlogs/comparatorlogs/buildtimeComparatorUnanticipated.log.txt'>https://download.eclipse.org/eclipse/downloads/drops4/${BUILD_ID}/buildlogs/comparatorlogs/buildtimeComparatorUnanticipated.log.txt</a><br><br>\""
287287
else
288288
echo -e "DEBUG: comparator logSize of $logSize was not greater than comparatorLogMinimumSize of ${comparatorLogMinimumSize}"
289-
fn-write-property COMPARATOR_ERRORS_SUBJECT "\" \""
290-
fn-write-property COMPARATOR_ERRORS_BODY "\" \""
289+
fn-write-property COMPARATOR_ERRORS_SUBJECT "\"\""
290+
fn-write-property COMPARATOR_ERRORS_BODY "\"\""
291291
fi
292292

eclipse-platform-parent/pom.xml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,9 @@
8585
<tycho-snapshot-repo.url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</tycho-snapshot-repo.url>
8686

8787
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
88-
<cbi-jdt-repo.url>https://repo.eclipse.org/content/repositories/eclipse-staging/</cbi-jdt-repo.url>
89-
<cbi-ecj-version>3.40.0.v20241112-0530</cbi-ecj-version>
88+
89+
<eclipse-snapshots-repo.url>https://repo.eclipse.org/content/repositories/eclipse-snapshots/</eclipse-snapshots-repo.url>
90+
<cbi-ecj-version>3.40.0-SNAPSHOT</cbi-ecj-version>
9091

9192
<!--
9293
repo for released versions of CBI. Note, we intentionally use as specific a repo as possible.
@@ -189,15 +190,10 @@
189190
</pluginRepository>
190191

191192
<pluginRepository>
192-
<id>cbi-jdt</id>
193-
<url>${cbi-jdt-repo.url}</url>
194-
<releases>
195-
<enabled>true</enabled>
196-
</releases>
197-
<snapshots>
198-
<enabled>true</enabled>
199-
</snapshots>
193+
<id>eclipse-snapshots</id>
194+
<url>${eclipse-snapshots-repo.url}</url>
200195
</pluginRepository>
196+
201197
<pluginRepository>
202198
<id>cbi-snapshots</id>
203199
<url>${cbi-snapshots-repo.url}</url>

0 commit comments

Comments
 (0)