~petermakowski/launchpad:feat(bugs)-inline-images

Last commit made on 2023-08-17
Get this branch:
git clone -b feat(bugs)-inline-images https://git.launchpad.net/~petermakowski/launchpad
Only Peter Makowski can upload to this branch. If you are Peter Makowski please log in for upload directions.

Branch merges

Branch information

Name:
feat(bugs)-inline-images
Repository:
lp:~petermakowski/launchpad

Recent commits

99da5a8... by Peter Makowski

feat(bugs): display inline images

Succeeded
[SUCCEEDED] docs:0 (build)
[SUCCEEDED] lint:0 (build)
[SUCCEEDED] mypy:0 (build)
13 of 3 results
0b1d40b... by Colin Watson

Pass SITE_NAME environment variable to run-parts

Merged from https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/449286

c67d67b... by Colin Watson

Pass SITE_NAME environment variable to run-parts

A number of the hook scripts in
https://bazaar.launchpad.net/+branch/ubuntu-archive-publishing rely on
being able to tell the difference between our different deployments, so
that they can behave differently in production and non-production
environments. For example,
https://bazaar.launchpad.net/+branch/ubuntu-archive-publishing/view/head:/publish-distro.d/10-sign-releases
uses different signing keys for different environments, since of course
dogfood doesn't have the production keys.

At the moment, we rely on the `LPCONFIG` variable (implicitly inherited
by these hook scripts from the parent process) for this. However, in a
charmed deployment, `LPCONFIG` is set purely based on the charm name,
and is the same across production and non-production deployments of the
same charm. As a result, we can't rely on it for this any more.

An approach that we've taken in a few other places is to conditionalize
behaviour based on the main site's hostname. This has the advantage
that the condition is spelled using an existing user-visible name (e.g.
"launchpad.net") rather than an internal codename that you're just
expected to know (e.g. "production" or the various values of
`LPCONFIG`). To support this, I've invented the `SITE_NAME` environment
variable, which the publisher now sets to the main site's hostname when
running its hook scripts.

04793bc... by Colin Watson

charm: Sync ftpmaster charm-wheels/ols-layers with other charms

Merged from https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/449263

cfe430c... by Colin Watson

Expand relative directories in PublisherConfig.root_dir

Merged from https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/449222

85b8ffd... by Colin Watson

charm: Sync ftpmaster charm-wheels/ols-layers with other charms

Compare https://git.launchpad.net/launchpad/commit?id=1099f303dc. (The
changes to `build-snaps`, `build-packages`, and
`reactive-charm-build-arguments` from that commit already appear to be
in place in these two charms as well.)

aa826bb... by Colin Watson

charm/launchpad-admin: Run pgkillactive/pgkillidle

Merged from https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/449194

49ec268... by Colin Watson

Expand relative directories in PublisherConfig.root_dir

The `PublisherConfig` table is designed quite strangely: it includes a
`root_dir` column which stores the root file system path at which each
distribution is published. This is a problem for charmed deployments of
the primary Ubuntu and copy archive publishers, because our charms don't
use the same base directory as our legacy deployments.

Fortunately, all the existing paths are absolute, so we have a
reasonable migration path that doesn't require us to change the database
at the same time as migrating to a new deployment. Interpret relative
paths in `PublisherConfig.root_dir` as being relative to a new
`config.archivepublisher.archives_dir` configuration entry; we can set
this to appropriate values in both legacy and charmed deployments, and
then change existing production database rows to use relative paths.

b4af55e... by Colin Watson

Merge db-stable 5509e62087 (Add RevisionStatusReport.distro_arch_series)

Merged from https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/449211

db91c55... by Colin Watson

Silence an error from "make -C database/replication stagingsetup"

Merged from https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/449195