Skip to content

Commit 21f370f

Browse files
committed
[RelEng] Clean doc-bundle qualifierUpdate files in release preparation
Add a step to the release preparation pipeline that clears the content of the 'forceQualifierUpdate.txt' files in all doc bundles. Submit the change in a separate commit or skip it if the files are already empty.
1 parent a8e2212 commit 21f370f

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

JenkinsJobs/Releng/prepareNextDevCycle.jenkinsfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,24 @@ pipeline {
185185
commitAllChangesExcludingSubmodules("Move previous version to ${PREVIOUS_RELEASE_CANDIDATE_TAG} in build scripts")
186186
}
187187
}
188+
stage('Clear Qualifier-update files') {
189+
steps {
190+
dir('eclipse.platform.common/bundles') {
191+
sh '''
192+
# Clear content of all forceQualifierUpdate files in this directory
193+
for file in */forceQualifierUpdate.txt; do
194+
> "$file"
195+
done
196+
# If content was removed, commit cleared files.
197+
if [ -n "$(git diff --shortstat .)" ] ; then
198+
git commit --message "Clean forceQualifierUpdate files of doc bundles for ${NEXT_RELEASE_VERSION} development" .
199+
else
200+
echo 'The forceQualifierUpdate files of all doc bundles are already empty. Nothing to do.'
201+
fi
202+
'''
203+
}
204+
}
205+
}
188206
stage('Apply individual updates') {
189207
environment {
190208
UPDATE_SCRIPT = 'prepareNextDevCycle.sh'

RELEASE.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,6 @@ Previously they were created in ther own job:
187187
- Update the last release build versions in [eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties](eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties)
188188
- 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)
189189
- 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)
190-
**General Cleanup**
191-
- In [eclipse.platform.common] search for and clear out all of the forceQualifierUpdate.txt files.
192-
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.
193190

194191
**RC2a Release**
195192
* Sometimes there is a critical issue that requires a fix, if it's decided that one is needed then an RC2a (followed by RC2b, RC2c etc if necessary) is built from the maintenance branch and promoted using the RC2 process.

scripts/newReleasePrep.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ BODY="This preparation work involves the following tasks. For previous bug pleas
3232
- [ ] Create ${NEXT_STREAM}-I-builds repo
3333
- [ ] Run [`Prepare Next Development Cycle`](https://ci.eclipse.org/releng/job/Releng/job/prepareNextDevCycle/) job and submit the created changes
3434
- [ ] Update version number in Mac's Eclipse.app for ${NEXT_STREAM}
35-
- [ ] Clean forceQualifierUpdate files for doc bundles
3635
- [ ] Update builds and repo cleanup scripts for ${NEXT_STREAM}
3736
- [ ] Update check composites script to verify ${NEXT_STREAM} repositories
3837
- [ ] Update Comparator repo and eclipse run repo to ${NEXT_STREAM}-I-builds repo

0 commit comments

Comments
 (0)