Skip to content

Commit 6f4f81f

Browse files
committed
[RelEng] Force push tags and update branches in promotion pipeline
This allows the release tag and build-update branches to be overwritten if a very late re-spin of the release build happens, i.e. after the release was already promoted (but not yet published).
1 parent ce6e389 commit 6f4f81f

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

JenkinsJobs/Releng/promoteBuild.jenkinsfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ pipeline {
148148
fi
149149
git tag -a -m "${SIGNOFF_BUG}" ${TAG} HEAD
150150
# git push fails if the tag already exists
151-
git push --verbose ${pushURL} tag ${TAG}
151+
git push --force --verbose ${pushURL} tag ${TAG}
152152
}
153153
tagBuild
154154
export -f tagBuild
@@ -261,8 +261,8 @@ pipeline {
261261
pushURL=$(echo $pushURL|sed --expression 's|https://github.com/|[email protected]:|')
262262
fi
263263

264-
git push ${pushURL} "master:refs/heads/update-build-to-R${BUILD_MAJOR}.${BUILD_MINOR}"
265-
git push ${pushURL} "updateMaintenance:refs/heads/update-${MAINTENANCE_BRANCH}"
264+
git push --force ${pushURL} "master:refs/heads/update-build-to-R${BUILD_MAJOR}.${BUILD_MINOR}"
265+
git push --force ${pushURL} "updateMaintenance:refs/heads/update-${MAINTENANCE_BRANCH}"
266266
'''
267267
}
268268
// Create PRs agains the master and maintenance branch

0 commit comments

Comments
 (0)