Skip to content

Commit fa6e87e

Browse files
committed
[RelEng] Fix determination of baseline drop for first promotions
The removal of the just promoted drop must happen before check if the list of baseline drops is empty. Otherwise for the first promotion of a release cycle (usually M1) that check is useless. Follow-up on - #3651
1 parent 85d6422 commit fa6e87e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

JenkinsJobs/Releng/promoteBuild.jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,10 @@ pipeline {
151151
renameBuildDrop('eclipse/downloads/drops4', "${DROP_ID}", "${BUILD_LABEL}", "${DL_DROP_ID}", "${DL_LABEL}") { buildProperties ->
152152
script {
153153
def baselineBuilds = utilities.listBuildDropDirectoriesOnRemote("${EP_ROOT}/eclipse/downloads/drops4", "${DL_TYPE}*") // sorted in ascending order
154+
baselineBuilds.remove(env.DL_DROP_ID) // ignore the just promoted drop when determining the latest
154155
if (baselineBuilds.isEmpty() && "${DL_TYPE}" == 'S') { // For M1 usually no previous stable build exists
155156
baselineBuilds = utilities.listBuildDropDirectoriesOnRemote("${EP_ROOT}/eclipse/downloads/drops4", 'R*')
156157
}
157-
baselineBuilds.remove(env.DL_DROP_ID) // ignore the just promoted drop when determining the latest
158158
buildProperties.gitTag = env.GIT_TAG
159159
buildProperties.gitBaselineTag = utilities.stableBuildGitTag("${baselineBuilds.last()}")
160160
echo "gitTag: ${buildProperties.gitTag}, gitBaselineTag: ${buildProperties.gitBaselineTag}"

0 commit comments

Comments
 (0)