Skip to content

Commit

Permalink
[Build] Use last successful ECJ snapshot in verification builds
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
HannesWell committed Nov 27, 2024
1 parent bb1caf5 commit a21cd80
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 16 deletions.
5 changes: 5 additions & 0 deletions JenkinsJobs/Builds/I_build.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,11 @@ spec:
}
}
stage('Trigger publication to Maven snapshots repo') {
when {
environment name: 'COMPARATOR_ERRORS_SUBJECT', value: ''
// On comparator-erros, skip the deployment of snapshot version to the 'eclipse-snapshots' maven repository to prevent that ECJ snapshot
// from being used in verification builds. Similar to how the p2-repository is not added to the I-build composite in that case.
}
steps {
container('jnlp') {
build job: 'CBIaggregator', parameters: [string(name: 'snapshotOrRelease', value: '-snapshot')], wait: false
Expand Down
17 changes: 7 additions & 10 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,6 @@
- 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.
- Make sure to mention that the Master branch is now again open for development.
* For **Milestone builds** return the I-builds to the normal schedule.
* **Update ECJ compiler** in the platform build (if it needs to be updated).
* To find the new compiler version:
- Go to the update site for the release candidate
- Click `plugins`
- Find `org.eclipse.jdt.core.complier.batch_${ecjversion}.jar`
* Edit the [copyAndDeployJDTCompiler](https://ci.eclipse.org/jdt/job/copyAndDeployJDTCompiler) job in Jenkins
- Only JDT committers can run the job, but Releng/Platform committers can configure it
- Update the default values of the `versionfolder`, `buildid` and `ecjversion` parameters.
- Update the build triggers to schedule a build for the current date.
* 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)
* **After RC1**
* Leave the I-builds running on the milestone schedule for RC2.
* Comment on EMF, ECF and Orbit issues to ask for final release builds.
Expand Down Expand Up @@ -214,6 +204,13 @@ The release is scheduled for 10AM EST. Typically the jobs are scheduled beforeha
- 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)
- 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)
- Update baselineCode in [production/testScripts/updateTestResultsPages.sh](production/testScripts/updateTestResultsPages.sh)
**Update ECJ compiler** in the platform build (if it needs to be updated).
- To find the new compiler version (usually it's the previous minor version incremented by one):
- Go to the update site of the new I-build repository
- Click `plugins`
- Find `org.eclipse.jdt.core.complier.batch_${ecjversion}.jar`
- 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)

**General Cleanup**
- In [eclipse.platform.common] search for and clear out all of the forceQualifierUpdate.txt files.
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.
Expand Down
4 changes: 2 additions & 2 deletions cje-production/mbscripts/mb300_gatherEclipseParts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ then
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>\""
else
echo -e "DEBUG: comparator logSize of $logSize was not greater than comparatorLogMinimumSize of ${comparatorLogMinimumSize}"
fn-write-property COMPARATOR_ERRORS_SUBJECT "\" \""
fn-write-property COMPARATOR_ERRORS_BODY "\" \""
fn-write-property COMPARATOR_ERRORS_SUBJECT "\"\""
fn-write-property COMPARATOR_ERRORS_BODY "\"\""
fi

9 changes: 5 additions & 4 deletions eclipse-platform-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@
<!-- only used when Tycho snapshot repo is enabled in <pluginRepositories> further down -->
<tycho-snapshot-repo.url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</tycho-snapshot-repo.url>

<cbi-jdt-repo.url>https://repo.eclipse.org/content/repositories/eclipse-staging/</cbi-jdt-repo.url>
<cbi-ecj-version>3.40.100.v20241127-0801</cbi-ecj-version>
<eclipse-snapshots-repo.url>https://repo.eclipse.org/content/repositories/eclipse-snapshots/</eclipse-snapshots-repo.url>
<cbi-ecj-version>3.40.100-SNAPSHOT</cbi-ecj-version>

<!--
repo for released versions of CBI. Note, we intentionally use as specific a repo as possible.
Expand Down Expand Up @@ -181,9 +181,10 @@
</pluginRepository>

<pluginRepository>
<id>cbi-jdt</id>
<url>${cbi-jdt-repo.url}</url>
<id>eclipse-snapshots</id>
<url>${eclipse-snapshots-repo.url}</url>
</pluginRepository>

<pluginRepository>
<id>eclipse-cbi</id>
<url>${eclipse-cbi-repo.url}</url>
Expand Down

0 comments on commit a21cd80

Please sign in to comment.