~racb/git-ubuntu:prepare-upload

Branch merges

Propose for merging

Merged into git-ubuntu:master at revision c06eb0f37e5c54bd22eed30c0f0b184b919eb16e

Server Team CI bot: Approve (continuous-integration) on 2021-10-12

Christian Ehrhardt : Approve on 2021-10-12

Diff: 399 lines (+161/-83)

3 files modified

gitubuntu/__main__.py (+1/-1)
gitubuntu/prepare_upload.py (+83/-29)
gitubuntu/prepare_upload_test.py (+77/-53)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

c06eb0f... by Robie Basak on 2021-10-12

prepare-upload: add mangle feature

prepare-upload is changed to provide two subcommands. "args" does what we
did previously. "mangle" pushes like "args" but then mangles an existing
changelog file to add the headers as required.

8ebd07c... by Robie Basak on 2021-10-12

prepare_upload: factor out push function

This will allow us to do other things with the headers than just print
them; for example to add a changes file mangling mechanism.

41f7efe... by Robie Basak on 2021-10-12

Rename push-for-upload to prepare-upload

0500536... by Robie Basak on 2021-08-17

Add comment to change date override file

59fc0f6... by Robie Basak on 2021-08-17

Add changelog date override for prips

8f476f1... by Robie Basak on 2021-08-16

Merge branch 'push-for-upload'

c9eb97e... by Robie Basak on 2021-08-16

poller: add --extra-trusted-keyring option

Debian and Ubuntu occasionally add new keys, and start signing their apt
repositories with them. Since we build with Ubuntu Focal's shipped
debian-keyring and ubuntu-keyring packages, these don't get updated with
the keys used by these updates. Consequently signature validation fails
and the poller fails to start.

Previously we were adjusting our packaging to include the newer public
keys, but this is becoming cumbersome and would need to be reimplemented
against our new deb/snap packaging anyway, since we rebased the snap to
core20 and a Focal deb build.

Instead, it seems easier to allow the importer service operator to
simply add the keys and provide them to the poller on startup. This will
save round tripping through the packaging for these updates in the
future. In practice there is only one importer service running, so this
should reduce maintenance burden overall.

e5e1bf6... by Robie Basak on 2021-08-16

scriptutils/poller: explicitly specify gpg paths

This is a precursor to us parameterising it. This change should not
change behaviour.

39a311b... by Robie Basak on 2021-08-16

Update scriptutils docstrings

Update to use our current style. The srcpkgs_to_import_list was actually
returning a set, not a list as previously documented, so this is
corrected.

c82dbf7... by Robie Basak on 2021-08-16

Merge remote-tracking branch 'racb/snap-grade-stable'