Merge ~cjwatson/launchpad-buildd:revise-deployment-process into launchpad-buildd:master

[Colin Watson]

Revise ordering of deployment documentation

We should be performing QA before proposing a release commit, not after.

[Jürgen Gmach (jugmac00)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 34fdff6..3c2b860 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ launchpad-buildd (216) UNRELEASED; urgency=medium
   [ Colin Watson ]
   * Add a timeout when revoking proxy tokens.
   * Log SHA-512 hash of built snaps (LP: #1979844).
+  * Revise ordering of deployment documentation.
 
   [ Jürgen Gmach ]
   * Pass secrets to the CI runner.
diff --git a/docs/how-to/deployment.rst b/docs/how-to/deployment.rst
index cfbe5a1..67473a3 100644
--- a/docs/how-to/deployment.rst
+++ b/docs/how-to/deployment.rst
@@ -4,29 +4,33 @@ How to deploy launchpad-buildd
 The following steps need to be performed before `Upgrading the builders
 <https://wiki.canonical.com/InformationInfrastructure/ISO/BuildInfrastructure/BuilddFixing>`_.
 
-1. Ensure everything has been merged to master.
+#. Ensure everything has been merged to master, that the `recipe
+   <https://code.launchpad.net/~launchpad/+recipe/launchpad-buildd-daily>`_
+   has built successfully, and that the resulting package has been published
+   in the `Launchpad PPA
+   <https://launchpad.net/~launchpad/+archive/ubuntu/ppa/+packages>`_.
 
-2. Create a new release branch, e.g. ``release-213``, based on master.
+#. Upgrade the dogfood builders
+   (you may need someone on the LP team with permissions to help with this;
+   see `documentation <https://wiki.canonical.com/InformationInfrastructure/ISO/BuildInfrastructure/BuilddFixing#Upgrading_launchpad-buildd_in_scalingstack>`_).
+
+#. Perform QA on dogfood until satisfied.
+
+#. Create a new release branch, e.g. ``release-213``, based on master.
 
-3. Run ``DEBEMAIL="<email address>" DEBFULLNAME="<name>" dch -rD focal``.
+#. Run ``DEBEMAIL="<email address>" DEBFULLNAME="<name>" dch -rD focal``.
    The later recipe build will prepend the correct preamble for each Ubuntu release.
 
-4. Create a commit with a title like ``releasing package launchpad-buildd version 213``,
-   push this branch and open a MergeProposal with a title like
+#. Create a commit with a title like ``releasing package launchpad-buildd version 213``,
+   push this branch and open a merge proposal with a title like
    ``Release version 213`` for review.
 
-5. Once the release branch has merged to master,
+#. Once the release branch has merged to master,
    tag the release commit (e.g. ``git tag 213 && git push origin --tags``) and
    check https://code.launchpad.net/~launchpad/+recipe/launchpad-buildd-daily
    for the recipe build to happen.
    You can start a build if required.
 
-6. Upgrade the dogfood builders
-   (you may need someone on the LP team with permissions to help with this;
-   see `documentation <https://wiki.canonical.com/InformationInfrastructure/ISO/BuildInfrastructure/BuilddFixing#Upgrading_launchpad-buildd_in_scalingstack>`_).
-
-7. Perform QA
-
-8. File an upgrade RT (`sample <https://portal.admin.canonical.com/C150737>`_),
+#. File an upgrade RT (`sample <https://portal.admin.canonical.com/C150737>`_),
    noting the version number and possibly multiple suites/releases
    (`IS procedure <https://wiki.canonical.com/InformationInfrastructure/ISO/BuildInfrastructure/BuilddFixing>`_).