Skip to content

Commit 1fb1123

Browse files
authored
Merge pull request ubuntu#72 from s-makin/aa-round-three
Next round of AA changes
2 parents 6194927 + 58fb520 commit 1fb1123

27 files changed

+820
-721
lines changed

docs/.custom_wordlist.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ Bileto
3232
blocklist
3333
BOF
3434
BOFs
35+
boolean
3536
bootable
3637
bootloader
3738
bootloaders
@@ -62,6 +63,8 @@ cryptographically
6263
CVE
6364
CVEs
6465
datacenter
66+
Debcrafter
67+
Debcrafters
6568
debdiff
6669
debhelper
6770
debian
@@ -117,6 +120,7 @@ https
117120
ia
118121
IA
119122
IEEE
123+
incrementing
120124
Intersphinx
121125
ISO
122126
ISOs
@@ -143,6 +147,8 @@ Lubuntu
143147
macOS
144148
Maintainer's
145149
manpage
150+
Masters
151+
matic
146152
Matic
147153
meetingology
148154
mentorship
@@ -184,11 +190,16 @@ Rockcraft
184190
rst
185191
rulebook
186192
RULEs
193+
runtime
187194
SCM
188195
schroots
196+
SLA
197+
SLAs
189198
SLO
190199
SLOs
191200
SONAME
201+
SOP
202+
SOPs
192203
SRU
193204
SRUs
194205
subdirectory
@@ -234,6 +245,7 @@ VMs
234245
vorlon
235246
WCAG
236247
webops
248+
whitelist
237249
WNPP
238250
wordlist
239251
workspaces

docs/contributors/advanced/plus-one-maintenance.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ to tackle on one's free time — and makes for less administrative overhead.
4444
Furthermore many of the cases eventually need a build, or a combined proposed
4545
migration which you'd want to track and follow up on for a few days.
4646

47-
However, it is perfectly fine to pick up shifts for shorter durations.
47+
However, it is perfectly fine to pick up shifts for a shorter duration.
4848

4949
## The work
5050

@@ -56,7 +56,7 @@ report to be posted to the [dedicated Discourse
5656
category](https://discourse.ubuntu.com/c/pre-release-discussion/plusone-maintenance/415)
5757
at the end of shift.
5858

59-
The report has two main purposes. The first is to act as a handoff document to
59+
The report has two main purposes. The first is to act as a hand-off document to
6060
the next shift, outlining work items that need following up on. Those could be
6161
fixes needing sponsorship, unfinished investigations, upcoming transitions from
6262
Debian, etc.
@@ -120,7 +120,7 @@ The priority of these rises along with the cycle. We want as few packages
120120
failing to build at release time as possible, as it makes security updates of
121121
these packages that much harder. An interesting aspect of these is that they
122122
are usually isolated and can be worked on without interfering much with other
123-
contributers.
123+
contributors.
124124

125125
Good sources for these are test rebuild results, periodically posted to [the
126126
ubuntu-devel list](https://lists.ubuntu.com/archives/ubuntu-devel/), as well as
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
(sru-process)
1+
(sru-process)=
22
# The SRU process overview

docs/staging/AA/aa-museum.md

Lines changed: 46 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
(aa-museum)=
22
# Archive Admin museum
33

4+
```{important}
5+
This page should not be moved out of the staging area in its current state.
6+
```
7+
48
All this content is saved from
59
[the Wiki Archive Admin page](https://wiki.ubuntu.com/ArchiveAdministration)
6-
10+
This page houses all the content which is no longer up-to-date, but might
11+
still be of historical interest.
712

813
## The museum
914

10-
This section houses all the content which is no longer up-to-date, but might
11-
still be of historical interest. All of this content is now deprecated and
12-
you should refer to the main {ref}`archive-administration` documentation.
15+
All of this content is now deprecated and you should refer to the main
16+
{ref}`archive-administration` documentation.
1317

1418

1519
### Useful runes
@@ -68,20 +72,25 @@ Archive.
6872

6973
Shows override discrepancies between architectures, which are generally bugs.
7074

71-
* [`http://people.canonical.com/~ubuntu-archive/testing/xenial_probs.html`](http://people.canonical.com/~ubuntu-archive/testing/xenial_probs.html)
75+
* `http://people.canonical.com/~ubuntu-archive/testing/xenial_probs.html`
76+
77+
**note, this link 404s and is outdated**
7278

7379
Generated by the half-hourly run of `britney` and indicates packages that are
7480
uninstallable on Xenial, usually due to missing dependencies or problematic
75-
conflicts. **note, this link 404s**
81+
conflicts.
82+
83+
* `http://people.canonical.com/~ubuntu-archive/testing/xenial_outdate.html`
7684

77-
* [`http://people.canonical.com/~ubuntu-archive/testing/xenial_outdate.html`](http://people.canonical.com/~ubuntu-archive/testing/xenial_outdate.html)
85+
**note, this link 404s and is outdated**
7886

7987
Lists differences between binary and source versions in the Archive. This
8088
often shows up both build failures (where binaries are out of date for
8189
particular architectures) but also where a binary is
82-
No longer Built from the Source. **note, this link 404s**
90+
No longer Built from the Source.
8391

84-
* [`~ubuntu-archive/NBS/`](https://ubuntu-archive-team.ubuntu.com/NBS/) and [`~ubuntu-archive/nbs.html`](https://ubuntu-archive-team.ubuntu.com/nbs.html)
92+
* [`~ubuntu-archive/NBS/`](https://ubuntu-archive-team.ubuntu.com/NBS/) and
93+
[`~ubuntu-archive/nbs.html`](https://ubuntu-archive-team.ubuntu.com/nbs.html)
8594

8695
This contains a list of binary packages which are Not Built from Source (NBS)
8796
any more. The files contain the list of reverse dependencies of those packages
@@ -107,7 +116,7 @@ Soyuz stores one chroot per (suite, architecture).
107116

108117
`manage-chroot` allows the following actions upon a specified chroot:
109118

110-
```bash
119+
```none
111120
$ ./manage-chroot
112121
Usage: manage-chroot -a ARCHITECTURE [options] <get|info|remove|set>
113122
@@ -116,7 +125,7 @@ manage-chroot: error: You must specify an architecture.
116125

117126
Downloading (`get`) an existing chroot:
118127

119-
```bash
128+
```none
120129
$ ./manage-chroot [-s SUITE] <-a ARCH> get
121130
```
122131

@@ -125,7 +134,7 @@ The chroot will be downloaded and stored in the local disk name as
125134

126135
Uploading (`add`/`update`) a new chroot:
127136

128-
```bash
137+
```none
129138
$ ./manage-chroot [-s SUITE] <-a ARCH> set -f <CHROOT_FILE>
130139
```
131140

@@ -169,7 +178,7 @@ in the usual way.
169178
This works the same as the `ubuntu-mozilla-security` PPA, above. E.g., using
170179
`lp:ubuntu-qa-tools/security-tools/unembargo`:
171180

172-
```bash
181+
```none
173182
$ unembargo --ppa=ubuntu-security-proposed -r xenial --pocket=proposed gnupg
174183
```
175184

@@ -179,12 +188,13 @@ $ unembargo --ppa=ubuntu-security-proposed -r xenial --pocket=proposed gnupg
179188
With the new
180189
[Stable Release Cadence](https://wiki.ubuntu.com/Kernel/StableReleaseCadence),
181190
kernels are built in the
182-
[Kernel Team PPA](https://launchpad.net/~canonical-kernel-team/+archive/ppa)
191+
[Kernel Team PPA](https://launchpad.net/~canonical-kernel-team/+archive/ubuntu/ppa)
183192
and then pocket copied to the proposed pocket in the main archive once they are
184193
ACK-ed.
185194

186195
The two most useful URLs for this process are the
187-
[Kernel SRU Report](http://status.qa.ubuntu.com/reports/kernel-bugs/reports/sru-report.html),
196+
Kernel SRU Report `http://status.qa.ubuntu.com/reports/kernel-bugs/reports/sru-report.html`
197+
(**note that this link is outdated**),
188198
where you will find links to the tracking bugs (the magnifying glasses), as well
189199
as the status of each package in each release, and the
190200
[Kernel SRU workflow](https://wiki.ubuntu.com/Kernel/kernel-sru-workflow),
@@ -194,7 +204,8 @@ on tasks assigned to your team, and only when they're in the *Confirmed* state,
194204
and when you do, please reassign to yourself and set the task to *Fix Released*
195205
when you're done".
196206

197-
The [Pending SRU report](https://ubuntu-archive-team.ubuntu.com/pending-sru.html#kernelppa)
207+
The Pending SRU report `https://ubuntu-archive-team.ubuntu.com/pending-sru.html#kernelppa`
208+
(**The section for "kernel PPA" referenced in this URL gives a 404**)
198209
has a section for the kernel PPA which shows all newer kernels in the PPA,
199210
provides click-able links to open all bugs (with separate CVE bugs), and
200211
copy-and-paste-able `copy-proposed-kernel` and `sru-accept` commands (both in
@@ -237,7 +248,7 @@ following:
237248
`-updates`/`-security`. `find-bin-overrides` from `lp:ubuntu-qa-tools` can
238249
help with this. You use it like so:
239250

240-
```bash
251+
```none
241252
find-bin-overrides <pocket to compare to> <target pocket> <ubuntu release> <source package>=<version in pocket to compare to>,<old abi>,<new abi>
242253
```.
243254
@@ -247,7 +258,7 @@ following:
247258
`-release` pocket of Hardy. For the
248259
`linux-restricted-modules-2.6.24 source package`, you might use:
249260
250-
```bash
261+
```none
251262
$ find-bin-overrides release proposed hardy \
252263
linux-restricted-modules-2.6.24=2.6.24.12-16.34,2.6.24-16,2.6.24-30
253264
## hardy/linux-restricted-modules-2.6.24
@@ -257,7 +268,7 @@ following:
257268

258269
For the `linux` source package, you might use:
259270

260-
```bash
271+
```none
261272
$ find-bin-overrides release proposed hardy linux=2.6.24-16.30,2.6.24-16,2.6.24-30
262273
## hardy/linux
263274
...
@@ -300,7 +311,7 @@ case, it will report that the package needs to be merged by hand.
300311

301312
The output of the tool looks like this:
302313

303-
```bash
314+
```none
304315
$ ./copy-report
305316
The following packages can be copied safely:
306317
--------------------------------------------
@@ -334,25 +345,25 @@ built and then cleaned up from the `-proposed` pocket. The process is as follows
334345
1. When the package builds on all architectures, copy it to the partner release
335346
pocket (this makes it available to users). E.g.:
336347

337-
```bash
348+
```none
338349
$ ./copy-package -b --auto-approve --from=ubuntu/partner -s xenial-proposed --to-suite xenial adobe-flashplugin
339350
```
340351

341352
or to do all at once:
342353

343-
```bash
354+
```none
344355
$ for i in xenial bionic focal groovy; do ./copy-package -b --auto-approve --from=ubuntu/partner -s $i-proposed --to-suite $i adobe-flashplugin ; done
345356
```
346357

347358
1. Remove the package from proposed in the partner archive. E.g.:
348359

349-
```bash
360+
```none
350361
$ ./remove-package -A ubuntu/partner -m "copied to release" -s xenial-proposed adobe-flashplugin
351362
```
352363

353364
or to do all at once:
354365

355-
```bash
366+
```none
356367
$ for i in xenial bionic focal groovy; do ./remove-package -A ubuntu/partner -m "copied to release" -s $i-proposed adobe-flashplugin ; done
357368
```
358369

@@ -374,7 +385,7 @@ Most updates available in Debian are automatically synced before
374385
that were previously in Ubuntu will not be automatically reintroduced. To
375386
process these interactively:
376387

377-
```bash
388+
```none
378389
$ ./auto-sync --new-only
379390
```
380391

@@ -396,7 +407,7 @@ There are other useful tools in your `PATH` which are invaluable.
396407
`rmadison` (in the `devscripts` package, run on your client system) examines
397408
the current state of the archive for a given binary/source package:
398409

399-
```bash
410+
```none
400411
$ rmadison dpkg
401412
dpkg | 1.10.22ubuntu2 | warty | source, amd64, i386, powerpc
402413
dpkg | 1.10.22ubuntu2.1 | warty-security | source, amd64, i386, powerpc
@@ -407,7 +418,7 @@ $ rmadison dpkg
407418
dpkg | 1.13.11ubuntu5 | dapper | source, amd64, hppa, i386, ia64, powerpc, sparc
408419
```
409420

410-
```bash
421+
```none
411422
$ rmadison dselect
412423
dselect | 1.10.22ubuntu2 | warty | amd64, i386, powerpc
413424
dselect | 1.10.22ubuntu2.1 | warty-security | amd64, i386, powerpc
@@ -421,7 +432,7 @@ $ rmadison dselect
421432
Or when used with `-S` and a source package, the source and every binary built
422433
by it:
423434

424-
```bash
435+
```none
425436
$ rmadison -S dpkg
426437
dpkg | 1.10.22ubuntu2 | warty | source, amd64, i386, powerpc
427438
dpkg | 1.10.22ubuntu2.1 | warty-security | source, amd64, i386, powerpc
@@ -453,13 +464,13 @@ $ rmadison -S dpkg
453464

454465
`checkrdepends` lists the reverse dependencies of a given binary:
455466

456-
```bash
467+
```none
457468
$ checkrdepends -s zesty -b nm-applet
458469
```
459470

460471
or source package:
461472

462-
```bash
473+
```none
463474
$ checkrdepends -s zesty network-manager
464475
```
465476

@@ -514,7 +525,7 @@ Packages in `-proposed` can be moved to `-updates` once they are approved by
514525
someone from `sru-verification`, and have passed the minimum aging period of
515526
**7 days**. Use the `sru-release` script from `ubuntu-archive-tools` for this:
516527

517-
```bash
528+
```none
518529
$ ./sru-release xenial kdebase
519530
```
520531

@@ -547,13 +558,13 @@ To publish `firefox` version `22.0+build2-0ubuntu0.12.04.2` from the
547558
`ubuntu-mozilla-security` PPA to the `-security` pocket of Ubuntu's `precise`
548559
release, you would do the following:
549560

550-
```bash
561+
```none
551562
$ ./copy-package -b --from=~ubuntu-mozilla-security/ubuntu/ppa -s precise --to=ubuntu --to-suite precise-security -e 22.0+build2-0ubuntu0.12.04.2 firefox
552563
```
553564

554565
Alternatively, can use `lp:ubuntu-qa-tools/security-tools/unembargo` like so:
555566

556-
```bash
567+
```none
557568
$ unembargo --ppa=ubuntu-mozilla-security -r xenial --pocket=proposed chromium-browser
558569
```
559570

@@ -620,10 +631,8 @@ Additionally, performing the following should be considered:
620631

621632
### Outdated
622633

623-
```{admonition} Question
624-
:class: important
625-
This section is actually marked on the AA page as being outdated. Should we
626-
keep it for historical interest?
634+
```{note}
635+
This section is actually marked on the AA page as being outdated.
627636
```
628637

629638
#### Logging in

0 commit comments

Comments
 (0)