Merge ~jugmac00/launchpad-buildd:introduce-diataxis-framework into launchpad-buildd:master

Proposed by Jürgen Gmach
Status: Merged
Approved by: Jürgen Gmach
Approved revision: c6b33c49a5fb5a1ef7621d24bbee95e2fc73afdf
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~jugmac00/launchpad-buildd:introduce-diataxis-framework
Merge into: launchpad-buildd:master
Diff against target: 158 lines (+85/-17)
6 files modified
docs/how-to/building.rst (+2/-2)
docs/how-to/changelog_entry.rst (+20/-0)
docs/how-to/deployment.rst (+29/-0)
docs/how-to/developing.rst (+2/-12)
docs/how-to/qa.rst (+11/-0)
docs/index.rst (+21/-3)
Reviewer Review Type Date Requested Status
Ioana Lasc (community) Approve
Review via email: mp+415359@code.launchpad.net

Commit message

Introduce the Diátaxis documentation framework

To post a comment you must log in.
Revision history for this message
Ioana Lasc (ilasc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/docs/deployment.rst b/docs/explanation/deployment.rst
0similarity index 100%0similarity index 100%
1rename from docs/deployment.rst1rename from docs/deployment.rst
2rename to docs/explanation/deployment.rst2rename to docs/explanation/deployment.rst
diff --git a/docs/building.rst b/docs/how-to/building.rst
3similarity index 85%3similarity index 85%
4rename from docs/building.rst4rename from docs/building.rst
5rename to docs/how-to/building.rst5rename to docs/how-to/building.rst
index 4893bb8..280b2b7 100644
--- a/docs/building.rst
+++ b/docs/how-to/building.rst
@@ -1,5 +1,5 @@
1Building the project1How to build the project
2********************2************************
33
4In order to build the package you need ``dpkg-dev`` and ``fakeroot``.4In order to build the package you need ``dpkg-dev`` and ``fakeroot``.
55
diff --git a/docs/how-to/changelog_entry.rst b/docs/how-to/changelog_entry.rst
6new file mode 1006446new file mode 100644
index 0000000..ac00da1
--- /dev/null
+++ b/docs/how-to/changelog_entry.rst
@@ -0,0 +1,20 @@
1
2How to create a changelog entry
3*******************************
4
5Prerequisites
6-------------
7
8.. code:: bash
9
10 sudo apt install devscripts
11
12Create the changelog entry
13--------------------------
14
15In order to create a changelog entry in ``debian/changelog``,
16you need to run the following command:
17
18.. code:: bash
19
20 dch -U
diff --git a/docs/how-to/deployment.rst b/docs/how-to/deployment.rst
0new file mode 10064421new file mode 100644
index 0000000..a52be76
--- /dev/null
+++ b/docs/how-to/deployment.rst
@@ -0,0 +1,29 @@
1How to deploy launchpad-buildd
2******************************
3
4The following steps need to be performed before `Upgrading the builders
5<https://wiki.canonical.com/InformationInfrastructure/ISO/BuildInfrastructure/BuilddFixing>`_.
6
71. Ensure everything has been merged to master.
8
92. Create a new release branch, based on master.
10
113. Run ``DEBEMAIL="<email address>" DEBFULLNAME="<name>" dch -rD bionic``.
12 The later recipe build will prepend the correct preamble for each Ubuntu release.
13
144. Commit and push this branch, open a MergeProposal for review.
15
165. Once the release branch has merged to master,
17 tag the release commit and check https://code.launchpad.net/~launchpad/+recipe/launchpad-buildd-daily
18 for the recipe build to happen.
19 You can start a build if required.
20
216. Upgrade the dogfood builders
22 (you may need someone on the LP team with permissions to help with this;
23 see `documentation <https://wiki.canonical.com/InformationInfrastructure/ISO/BuildInfrastructure/BuilddFixing#Upgrading_launchpad-buildd_in_scalingstack>`_).
24
257. Perform QA
26
278. File an upgrade RT (`sample <https://portal.admin.canonical.com/C135751>`_),
28 noting the version number and possibly multiple suites/releases
29 (`IS procedure <https://wiki.canonical.com/InformationInfrastructure/ISO/BuildInfrastructure/BuilddFixing>`_).
diff --git a/docs/developing.rst b/docs/how-to/developing.rst
0similarity index 78%30similarity index 78%
1rename from docs/developing.rst31rename from docs/developing.rst
2rename to docs/how-to/developing.rst32rename to docs/how-to/developing.rst
index 1db8095..895d0a7 100644
--- a/docs/developing.rst
+++ b/docs/how-to/developing.rst
@@ -1,5 +1,5 @@
1Developing1How to set up a development environment
2**********2***************************************
33
4First of all, it is recommended that you create an lxc container, since the4First of all, it is recommended that you create an lxc container, since the
5following steps will make changes in your system. And since some build types5following steps will make changes in your system. And since some build types
@@ -29,13 +29,3 @@ test suite both in python2 and python3.
29More information on how to integrate it with Launchpad can be found here:29More information on how to integrate it with Launchpad can be found here:
30https://dev.launchpad.net/Soyuz/HowToDevelopWithBuildd30https://dev.launchpad.net/Soyuz/HowToDevelopWithBuildd
3131
32
33Creating a changelog entry
34--------------------------
35
36In order to create a changelog entry in ``debian/changelog``,
37you need to run ``dch`` from the ``devscripts`` package.
38
39.. code:: bash
40
41 dch -U
diff --git a/docs/how-to/qa.rst b/docs/how-to/qa.rst
42new file mode 10064432new file mode 100644
index 0000000..e226d9a
--- /dev/null
+++ b/docs/how-to/qa.rst
@@ -0,0 +1,11 @@
1How to perform QA
2*****************
3
4Depending on the applied changes,
5you may need to perform the following build types:
6
71. `TranslationTemplates <https://dev.launchpad.net/Translations/GenerateTemplatesOnTestServers>`_
82. Source Package Recipe Build
93. OCI Image Build
104. Snap Build
115. Binary Package Build
diff --git a/docs/index.rst b/docs/index.rst
index 427c800..f8ae1de 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -20,6 +20,24 @@ See https://dev.launchpad.net/ for more context.
20 :maxdepth: 220 :maxdepth: 2
2121
22 self22 self
23 developing23
24 building24How-to guides
25 deployment25-------------
26
27.. toctree::
28 :maxdepth: 1
29
30 how-to/developing
31 how-to/changelog_entry
32 how-to/building
33 how-to/deployment
34 how-to/qa
35
36
37Explanation
38-----------
39
40.. toctree::
41 :maxdepth: 1
42
43 explanation/deployment

Subscribers

People subscribed via source and target branches