From b8722bc67c1e1ac9f764d72db2f566cfead5954c Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Wed, 11 Oct 2017 06:59:38 -0700 Subject: [PATCH] Add documentation on force-merging a change Change-Id: Ie6fd2a7fa968909440ae3a30b64a6b80792dd1c5 --- doc/source/sysadmin.rst | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/doc/source/sysadmin.rst b/doc/source/sysadmin.rst index 7265618f49..032c425ef0 100644 --- a/doc/source/sysadmin.rst +++ b/doc/source/sysadmin.rst @@ -284,6 +284,37 @@ Note if you created your working directory in a path that is not excluded by bup you will want to remove that directory when your work is done. /root/backup-restore-* is excluded so the path above is safe. +Force-Merging a Change +---------------------- + +Occasionally it is necessary to bypass the CI system and merge a +change directly. Usually, this is only required if we have a hole in +our testing of the CI or related systems themselves and have merged a +change which causes them to be unable to operate normally and +therefore unable to merge a reversion of the problematic change. In +these cases, use the following procedure to force-merge a change. + +* Add yourself to the *Project Bootstrappers* group in Gerrit. + +* Navigate to the change which needs to be merged and reload the page. + +* Remove any -2 votes on the change. + +* Add +2 Code-Review, and +1 Workflow votes if necessary, then add +2 + Verified. Also leave a review comment briefly explaining why this + was necessary, and make sure to mention it in the #openstack-infra + IRC channel (ideally as a #status log entry for the benefit of + those not paying close attention to scrollback). + +* At this point, a *Submit* Button should appear, click it. The + change should now be merged. + +* Remove yourself from *Project Bootstrappers* + +This procedure is the safest way to force-merge a change, ensuring +that all of the normal steps that Gerrit performs on repos still +happen. + Launching New Servers =====================