Merge launchpad:stable into launchpad:db-devel

[Colin Watson]

Manually merge from stable to fix time-dependent tests

This is needed on db-devel to make tests pass again; see https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/412682.

[Colin Watson (cjwatson)]

review: Approve

diff --git a/Makefile b/Makefile
index b2daade..90a640e 100644
--- a/Makefile
+++ b/Makefile
@@ -96,15 +96,19 @@ PIP_BIN = \
     bin/with-xvfb
 
 # DO NOT ALTER : this should just build by default
+.PHONY: default
 default: inplace
 
+.PHONY: schema
 schema: build
 	$(MAKE) -C database/schema
 	$(RM) -r /var/tmp/fatsam
 
+.PHONY: newsampledata
 newsampledata:
 	$(MAKE) -C database/schema newsampledata
 
+.PHONY: hosted_branches
 hosted_branches: $(PY)
 	$(PY) ./utilities/make-dummy-hosted-branches
 
@@ -115,6 +119,7 @@ $(API_INDEX): $(VERSION_INFO) $(PY)
 	    --force "$(APIDOC_TMPDIR)"
 	mv $(APIDOC_TMPDIR) $(APIDOC_DIR)
 
+.PHONY: apidoc
 ifdef LP_MAKE_NO_WADL
 apidoc:
 	@echo "Skipping WADL generation."
@@ -123,15 +128,18 @@ apidoc: compile $(API_INDEX)
 endif
 
 # Used to generate HTML developer documentation for Launchpad.
+.PHONY: doc
 doc:
 	$(MAKE) -C doc/ html
 
 # Run by PQM.
+.PHONY: check_config
 check_config: build
 	bin/test -m lp.services.config.tests -vvt test_config
 
 # Clean before running the test suite, since the build might fail depending
 # what source changes happened. (e.g. apidoc depends on interfaces)
+.PHONY: check
 check: clean build
 	# Run all tests. test_on_merge.py takes care of setting up the
 	# database.
@@ -141,6 +149,7 @@ check: clean build
 logs:
 	mkdir logs
 
+.PHONY: codehosting-dir
 codehosting-dir:
 	mkdir -p $(CODEHOSTING_ROOT)
 	mkdir -p $(CODEHOSTING_ROOT)/mirrors
@@ -155,11 +164,13 @@ ifneq ($(SUDO_UID),)
 	fi
 endif
 
+.PHONY: inplace
 inplace: build logs clean_logs codehosting-dir
 	if [ -d /srv/launchpad.test ]; then \
 		ln -sfn $(WD)/build/js $(CONVOY_ROOT); \
 	fi
 
+.PHONY: build
 build: compile apidoc jsbuild css_combine
 
 # LP_SOURCEDEPS_PATH should point to the sourcecode directory, but we
@@ -174,6 +185,7 @@ else
 	@exit 1
 endif
 
+.PHONY: css_combine
 css_combine: jsbuild_widget_css
 	${SHHH} bin/sprite-util create-image
 	${SHHH} bin/sprite-util create-css
@@ -184,18 +196,20 @@ css_combine: jsbuild_widget_css
 	# XXX 2020-06-12 twom This should have `--output-style compressed`. Removed for debugging purposes
 	SASS_BINARY_PATH=$(NODE_SASS_BINARY) $(YARN) run node-sass --include-path $(WD)/$(ICING) --follow --output $(WD)/$(ICING) $(WD)/$(ICING)/combo.scss
 
+.PHONY: css_watch
 css_watch: jsbuild_widget_css
 	${SHHH} bin/sprite-util create-image
 	${SHHH} bin/sprite-util create-css
 	ln -sfn ../../../../yarn/node_modules/yui $(ICING)/yui
 	SASS_BINARY_PATH=$(NODE_SASS_BINARY) $(YARN) run node-sass --include-path $(WD)/$(ICING) --follow --output $(WD)/$(ICING) $(WD)/$(ICING)/ --watch --recursive
 
-
+.PHONY: jsbuild_widget_css
 jsbuild_widget_css: bin/jsbuild
 	${SHHH} bin/jsbuild \
 	    --srcdir lib/lp/app/javascript \
 	    --builddir $(LP_BUILT_JS_ROOT)
 
+.PHONY: jsbuild_watch
 jsbuild_watch:
 	$(PY) bin/watch_jsbuild
 
@@ -218,6 +232,7 @@ $(JS_BUILD_DIR)/.production: yarn/package.json | $(YARN_BUILD)
 $(YUI_SYMLINK): $(JS_BUILD_DIR)/.production
 	ln -sfn ../../yarn/node_modules/yui $@
 
+.PHONY: $(LP_JS_BUILD)
 $(LP_JS_BUILD): | $(JS_BUILD_DIR)
 	mkdir -p $@/services
 	for jsdir in lib/lp/*/javascript lib/lp/services/*/javascript; do \
@@ -227,6 +242,7 @@ $(LP_JS_BUILD): | $(JS_BUILD_DIR)
 	find $@ -name 'tests' -type d | xargs rm -rf
 	LC_ALL=C.UTF-8 bin/lpjsmin -p $@
 
+.PHONY: jsbuild
 jsbuild: $(LP_JS_BUILD) $(YUI_SYMLINK)
 	LC_ALL=C.UTF-8 utilities/js-deps -n LP_MODULES -s build/js/lp \
 		-x '-min.js' -o build/js/lp/meta.js >/dev/null
@@ -252,6 +268,7 @@ requirements/combined.txt: \
 # It doesn't seem to be straightforward to build a wheelhouse of all our
 # dependencies without also building a useless wheel of Launchpad itself;
 # fortunately that doesn't take too long, and we just remove it afterwards.
+.PHONY: build_wheels
 build_wheels: $(PIP_BIN) requirements/combined.txt
 	$(RM) -r wheelhouse wheels
 	$(SHHH) $(PIP) wheel \
@@ -261,6 +278,7 @@ build_wheels: $(PIP_BIN) requirements/combined.txt
 	$(MAKE) clean_pip
 
 # Compatibility
+.PHONY: build_eggs
 build_eggs: build_wheels
 
 # setuptools won't touch files that would have the same contents, but for
@@ -290,6 +308,7 @@ $(subst $(VENV_PYTHON),,$(PIP_BIN)): $(VENV_PYTHON)
 
 # Explicitly update version-info.py rather than declaring $(VERSION_INFO) as
 # a prerequisite, to make sure it's up to date when doing deployments.
+.PHONY: compile
 compile: $(VENV_PYTHON)
 	${SHHH} utilities/relocate-virtualenv env
 	$(PYTHON) utilities/link-system-packages.py \
@@ -297,22 +316,28 @@ compile: $(VENV_PYTHON)
 	${SHHH} bin/build-twisted-plugin-cache
 	scripts/update-version-info.sh
 
+.PHONY: test_build
 test_build: build
 	bin/test $(TESTFLAGS) $(TESTOPTS)
 
+.PHONY: test_inplace
 test_inplace: inplace
 	bin/test $(TESTFLAGS) $(TESTOPTS)
 
+.PHONY: ftest_build
 ftest_build: build
 	bin/test -f $(TESTFLAGS) $(TESTOPTS)
 
+.PHONY: ftest_inplace
 ftest_inplace: inplace
 	bin/test -f $(TESTFLAGS) $(TESTOPTS)
 
+.PHONY: run
 run: build inplace stop
 	bin/run -r librarian,bing-webservice,memcached,rabbitmq \
 	-i $(LPCONFIG)
 
+.PHONY: run-testapp
 run-testapp: LPCONFIG=testrunner-appserver
 run-testapp: build inplace stop
 	LPCONFIG=$(LPCONFIG) INTERACTIVE_TESTS=1 bin/run-testapp \
@@ -321,40 +346,50 @@ run-testapp: build inplace stop
 run.gdb:
 	echo 'run' > run.gdb
 
+.PHONY: start-gdb
 start-gdb: build inplace stop support_files run.gdb
 	nohup gdb -x run.gdb --args bin/run -i $(LPCONFIG) \
 		-r librarian,bing-webservice
 		> ${LPCONFIG}-nohup.out 2>&1 &
 
+.PHONY: run_all
 run_all: build inplace stop
 	bin/run \
 	 -r librarian,sftp,codebrowse,bing-webservice,\
 	memcached,rabbitmq -i $(LPCONFIG)
 
+.PHONY: run_codebrowse
 run_codebrowse: compile
 	BRZ_PLUGIN_PATH=brzplugins $(PY) scripts/start-loggerhead.py
 
+.PHONY: start_codebrowse
 start_codebrowse: compile
 	BRZ_PLUGIN_PATH=$(shell pwd)/brzplugins $(PY) scripts/start-loggerhead.py --daemon
 
+.PHONY: stop_codebrowse
 stop_codebrowse:
 	$(PY) scripts/stop-loggerhead.py
 
+.PHONY: run_codehosting
 run_codehosting: build inplace stop
 	bin/run -r librarian,sftp,codebrowse,rabbitmq -i $(LPCONFIG)
 
+.PHONY: start_librarian
 start_librarian: compile
 	bin/start_librarian
 
+.PHONY: stop_librarian
 stop_librarian:
 	bin/killservice librarian
 
 $(VERSION_INFO):
 	scripts/update-version-info.sh
 
+.PHONY: support_files
 support_files: $(API_INDEX) $(VERSION_INFO)
 
 # Intended for use on developer machines
+.PHONY: start
 start: inplace stop support_files initscript-start
 
 # Run as a daemon - hack using nohup until we move back to using zdaemon
@@ -363,42 +398,52 @@ start: inplace stop support_files initscript-start
 # will not work as expected. For use on production servers, where
 # we know we don't need the extra steps in a full "make start"
 # because of how the code is deployed/built.
+.PHONY: initscript-start
 initscript-start:
 	nohup bin/run -i $(LPCONFIG) > ${LPCONFIG}-nohup.out 2>&1 &
 
 # Intended for use on developer machines
+.PHONY: stop
 stop: build initscript-stop
 
 # Kill launchpad last - other services will probably shutdown with it,
 # so killing them after is a race condition. For use on production
 # servers, where we know we don't need the extra steps in a full
 # "make stop" because of how the code is deployed/built.
+.PHONY: initscript-stop
 initscript-stop:
 	bin/killservice librarian launchpad
 
+.PHONY: shutdown
 shutdown: scheduleoutage stop
 	$(RM) +maintenancetime.txt
 
+.PHONY: scheduleoutage
 scheduleoutage:
 	echo Scheduling outage in ${MINS_TO_SHUTDOWN} mins
 	date --iso-8601=minutes -u -d +${MINS_TO_SHUTDOWN}mins > +maintenancetime.txt
 	echo Sleeping ${MINS_TO_SHUTDOWN} mins
 	sleep ${MINS_TO_SHUTDOWN}m
 
+.PHONY: harness
 harness: bin/harness
 	bin/harness
 
+.PHONY: iharness
 iharness: bin/iharness
 	bin/iharness
 
+.PHONY: rebuildfti
 rebuildfti:
 	@echo Rebuilding FTI indexes on launchpad_dev database
 	$(PY) database/schema/fti.py -d launchpad_dev --force
 
+.PHONY: clean_js
 clean_js:
 	$(RM) -r $(JS_BUILD_DIR)
 	$(RM) -r yarn/node_modules
 
+.PHONY: clean_pip
 clean_pip:
 	$(RM) -r build
 	if [ -d $(CONVOY_ROOT) ]; then $(RM) -r $(CONVOY_ROOT) ; fi
@@ -408,11 +453,14 @@ clean_pip:
 	$(RM) .installed.cfg
 
 # Compatibility.
+.PHONY: clean_buildout
 clean_buildout: clean_pip
 
+.PHONY: clean_logs
 clean_logs:
 	$(RM) logs/thread*.request
 
+.PHONY: lxc-clean
 lxc-clean: clean_js clean_pip clean_logs
 	# XXX: BradCrittenden 2012-05-25 bug=1004514:
 	# It is important for parallel tests inside LXC that the
@@ -446,31 +494,38 @@ lxc-clean: clean_js clean_pip clean_logs
 		$(RM) -r /var/tmp/launchpad_mailqueue; \
 	fi
 
+.PHONY: clean
 clean: lxc-clean
 	$(RM) -r $(CODEHOSTING_ROOT)
 
+.PHONY: realclean
 realclean: clean
 	$(RM) TAGS tags
 
+.PHONY: potemplates
 potemplates: launchpad.pot
 
 # Generate launchpad.pot by extracting message ids from the source
 # XXX cjwatson 2017-09-04: This was previously done using i18nextract from
 # z3c.recipe.i18n, but has been broken for some time.  The place to start in
 # putting this together again is probably zope.app.locales.
+.PHONY: launchpad.pot
 launchpad.pot:
 	echo "POT generation not currently supported; help us fix this!" >&2
 	exit 1
 
 # Called by the rocketfuel-setup script. You probably don't want to run this
 # on its own.
+.PHONY: install
 install: reload-apache
 
+.PHONY: copy-certificates
 copy-certificates:
 	mkdir -p /etc/apache2/ssl
 	cp configs/$(LPCONFIG)/launchpad.crt /etc/apache2/ssl/
 	cp configs/$(LPCONFIG)/launchpad.key /etc/apache2/ssl/
 
+.PHONY: copy-apache-config
 copy-apache-config: codehosting-dir
 	# Byte-compile scripts/_pythonpath.py first, otherwise Apache may do
 	# so as root and cause permission problems.
@@ -494,19 +549,23 @@ copy-apache-config: codehosting-dir
 		chown $(SUDO_UID):$(SUDO_GID) /srv/launchpad.test; \
 	fi
 
+.PHONY: enable-apache-launchpad
 enable-apache-launchpad: copy-apache-config copy-certificates
 	[ ! -e /etc/apache2/mods-available/version.load ] || a2enmod version
 	a2ensite local-launchpad
 
+.PHONY: reload-apache
 reload-apache: enable-apache-launchpad
 	service apache2 restart
 
+.PHONY: TAGS
 TAGS: compile
 	# emacs tags
 	ctags -R -e --languages=-JavaScript --python-kinds=-i -f $@.new \
 		$(CURDIR)/lib "$(SITE_PACKAGES)"
 	mv $@.new $@
 
+.PHONY: tags
 tags: compile
 	# vi tags
 	ctags -R --languages=-JavaScript --python-kinds=-i -f $@.new \
@@ -516,16 +575,9 @@ tags: compile
 PYDOCTOR = pydoctor
 PYDOCTOR_OPTIONS =
 
+.PHONY: pydoctor
 pydoctor:
 	$(PYDOCTOR) --make-html --html-output=apidocs --add-package=lib/lp \
 		--add-package=lib/canonical --project-name=Launchpad \
 		--docformat restructuredtext --verbose-about epytext-summary \
 		$(PYDOCTOR_OPTIONS)
-
-.PHONY: apidoc build_eggs build_wheels check check_config		\
-	clean clean_buildout clean_js clean_logs clean_pip compile	\
-	css_combine debug default doc ftest_build ftest_inplace		\
-	hosted_branches jsbuild jsbuild_widget_css launchpad.pot	\
-	pydoctor realclean reload-apache run run-testapp runner schema	\
-	sprite_css sprite_image start stop TAGS tags test_build		\
-	test_inplace $(LP_JS_BUILD)
diff --git a/database/sampledata/current-dev.sql b/database/sampledata/current-dev.sql
index 1a40702..56cdf56 100644
--- a/database/sampledata/current-dev.sql
+++ b/database/sampledata/current-dev.sql
@@ -3266,8 +3266,8 @@ ALTER TABLE codereviewvote ENABLE TRIGGER ALL;
 
 ALTER TABLE commercialsubscription DISABLE TRIGGER ALL;
 
-INSERT INTO commercialsubscription (id, date_created, date_last_modified, date_starts, date_expires, status, product, registrant, purchaser, whiteboard, sales_system_id) VALUES (1, '2012-10-08 11:09:37.75983', '2012-10-08 11:09:37.75983', '2012-10-08 11:09:37.838229', '2022-01-01 00:00:00', 10, 16, 65, 65, 'Complimentary 30 day subscription. -- Launchpad 2012-10-08', 'complimentary-30-day-2012-10-08 11:09:37.838229+00:00');
-INSERT INTO commercialsubscription (id, date_created, date_last_modified, date_starts, date_expires, status, product, registrant, purchaser, whiteboard, sales_system_id) VALUES (2, '2012-10-08 11:09:46.861812', '2012-10-08 11:09:46.861812', '2012-10-08 11:09:46.912691', '2022-01-01 00:00:00', 10, 17, 65, 65, 'Complimentary 30 day subscription. -- Launchpad 2012-10-08', 'complimentary-30-day-2012-10-08 11:09:46.912691+00:00');
+INSERT INTO commercialsubscription (id, date_created, date_last_modified, date_starts, date_expires, status, product, registrant, purchaser, whiteboard, sales_system_id) VALUES (1, '2012-10-08 11:09:37.75983', '2012-10-08 11:09:37.75983', '2012-10-08 11:09:37.838229', '2032-01-01 00:00:00', 10, 16, 65, 65, 'Complimentary 30 day subscription. -- Launchpad 2012-10-08', 'complimentary-30-day-2012-10-08 11:09:37.838229+00:00');
+INSERT INTO commercialsubscription (id, date_created, date_last_modified, date_starts, date_expires, status, product, registrant, purchaser, whiteboard, sales_system_id) VALUES (2, '2012-10-08 11:09:46.861812', '2012-10-08 11:09:46.861812', '2012-10-08 11:09:46.912691', '2032-01-01 00:00:00', 10, 17, 65, 65, 'Complimentary 30 day subscription. -- Launchpad 2012-10-08', 'complimentary-30-day-2012-10-08 11:09:46.912691+00:00');
 
 
 ALTER TABLE commercialsubscription ENABLE TRIGGER ALL;
diff --git a/database/sampledata/current.sql b/database/sampledata/current.sql
index 9e0310f..df050c1 100644
--- a/database/sampledata/current.sql
+++ b/database/sampledata/current.sql
@@ -3198,8 +3198,8 @@ ALTER TABLE codereviewvote ENABLE TRIGGER ALL;
 
 ALTER TABLE commercialsubscription DISABLE TRIGGER ALL;
 
-INSERT INTO commercialsubscription (id, date_created, date_last_modified, date_starts, date_expires, status, product, registrant, purchaser, whiteboard, sales_system_id) VALUES (1, '2012-10-08 11:09:37.75983', '2012-10-08 11:09:37.75983', '2012-10-08 11:09:37.838229', '2022-01-01 00:00:00', 10, 16, 65, 65, 'Complimentary 30 day subscription. -- Launchpad 2012-10-08', 'complimentary-30-day-2012-10-08 11:09:37.838229+00:00');
-INSERT INTO commercialsubscription (id, date_created, date_last_modified, date_starts, date_expires, status, product, registrant, purchaser, whiteboard, sales_system_id) VALUES (2, '2012-10-08 11:09:46.861812', '2012-10-08 11:09:46.861812', '2012-10-08 11:09:46.912691', '2022-01-01 00:00:00', 10, 17, 65, 65, 'Complimentary 30 day subscription. -- Launchpad 2012-10-08', 'complimentary-30-day-2012-10-08 11:09:46.912691+00:00');
+INSERT INTO commercialsubscription (id, date_created, date_last_modified, date_starts, date_expires, status, product, registrant, purchaser, whiteboard, sales_system_id) VALUES (1, '2012-10-08 11:09:37.75983', '2012-10-08 11:09:37.75983', '2012-10-08 11:09:37.838229', '2032-01-01 00:00:00', 10, 16, 65, 65, 'Complimentary 30 day subscription. -- Launchpad 2012-10-08', 'complimentary-30-day-2012-10-08 11:09:37.838229+00:00');
+INSERT INTO commercialsubscription (id, date_created, date_last_modified, date_starts, date_expires, status, product, registrant, purchaser, whiteboard, sales_system_id) VALUES (2, '2012-10-08 11:09:46.861812', '2012-10-08 11:09:46.861812', '2012-10-08 11:09:46.912691', '2032-01-01 00:00:00', 10, 17, 65, 65, 'Complimentary 30 day subscription. -- Launchpad 2012-10-08', 'complimentary-30-day-2012-10-08 11:09:46.912691+00:00');
 
 
 ALTER TABLE commercialsubscription ENABLE TRIGGER ALL;
diff --git a/lib/lp/_schema_circular_imports.py b/lib/lp/_schema_circular_imports.py
index af21a01..09fe6e4 100644
--- a/lib/lp/_schema_circular_imports.py
+++ b/lib/lp/_schema_circular_imports.py
@@ -64,7 +64,10 @@ from lp.code.interfaces.codereviewcomment import ICodeReviewComment
 from lp.code.interfaces.codereviewvote import ICodeReviewVoteReference
 from lp.code.interfaces.diff import IPreviewDiff
 from lp.code.interfaces.gitref import IGitRef
-from lp.code.interfaces.gitrepository import IGitRepository
+from lp.code.interfaces.gitrepository import (
+    IGitRepository,
+    IRevisionStatusReport,
+    )
 from lp.code.interfaces.gitrule import (
     IGitNascentRule,
     IGitNascentRuleGrant,
@@ -517,6 +520,8 @@ patch_entry_return_type(IGitRepository, 'subscribe', IGitSubscription)
 patch_entry_return_type(IGitRepository, 'getSubscription', IGitSubscription)
 patch_reference_property(IGitRepository, 'code_import', ICodeImport)
 patch_entry_return_type(IGitRepository, 'getRefByPath', IGitRef)
+patch_collection_return_type(
+    IGitRepository, 'getStatusReports', IRevisionStatusReport)
 patch_collection_property(
     IGitRepository, '_api_landing_targets', IBranchMergeProposal)
 patch_collection_property(
@@ -528,6 +533,10 @@ patch_collection_return_type(
 patch_list_parameter_type(
     IGitRepository, 'setRules', 'rules', InlineObject(schema=IGitNascentRule))
 
+# IRevisionStatusReport
+patch_reference_property(
+    IRevisionStatusReport, 'git_repository', IGitRepository)
+
 # ILiveFSFile
 patch_reference_property(ILiveFSFile, 'livefsbuild', ILiveFSBuild)
 
diff --git a/lib/lp/archivepublisher/publishing.py b/lib/lp/archivepublisher/publishing.py
index f18ca9f..a5a0cc4 100644
--- a/lib/lp/archivepublisher/publishing.py
+++ b/lib/lp/archivepublisher/publishing.py
@@ -1235,8 +1235,10 @@ class Publisher:
         release_file["Components"] = " ".join(
             reorder_components(all_components))
         release_file["Description"] = drsummary
-        if (pocket == PackagePublishingPocket.BACKPORTS and
-            distroseries.backports_not_automatic):
+        if ((pocket == PackagePublishingPocket.BACKPORTS and
+             distroseries.backports_not_automatic) or
+            (pocket == PackagePublishingPocket.PROPOSED and
+             distroseries.proposed_not_automatic)):
             release_file["NotAutomatic"] = "yes"
             release_file["ButAutomaticUpgrades"] = "yes"
 
diff --git a/lib/lp/archivepublisher/tests/test_publisher.py b/lib/lp/archivepublisher/tests/test_publisher.py
index 6ff8cb2..c0891dd 100644
--- a/lib/lp/archivepublisher/tests/test_publisher.py
+++ b/lib/lp/archivepublisher/tests/test_publisher.py
@@ -116,6 +116,7 @@ from lp.testing.matchers import FileContainsBytes
 
 
 RELEASE = PackagePublishingPocket.RELEASE
+PROPOSED = PackagePublishingPocket.PROPOSED
 BACKPORTS = PackagePublishingPocket.BACKPORTS
 
 
@@ -2064,6 +2065,45 @@ class TestPublisher(TestPublisherBase):
         self.assertIn("NotAutomatic: yes", get_release(BACKPORTS))
         self.assertIn("ButAutomaticUpgrades: yes", get_release(BACKPORTS))
 
+    def testReleaseFileForNotAutomaticProposed(self):
+        # Test Release file writing for series with NotAutomatic -proposed.
+        publisher = Publisher(
+            self.logger, self.config, self.disk_pool,
+            self.ubuntutest.main_archive)
+        self.getPubSource(filecontent=b'Hello world', pocket=RELEASE)
+        self.getPubSource(filecontent=b'Hello world', pocket=PROPOSED)
+
+        # Make everything other than breezy-autotest OBSOLETE so that they
+        # aren't republished.
+        for series in self.ubuntutest.series:
+            if series.name != "breezy-autotest":
+                series.status = SeriesStatus.OBSOLETE
+
+        publisher.A_publish(True)
+        publisher.C_writeIndexes(False)
+
+        def get_release(pocket):
+            release_path = os.path.join(
+                publisher._config.distsroot,
+                'breezy-autotest%s' % pocketsuffix[pocket], 'Release')
+            with open(release_path) as release_file:
+                return release_file.read().splitlines()
+
+        # When proposed_not_automatic is unset, no Release files have
+        # NotAutomatic: yes.
+        self.assertEqual(False, self.breezy_autotest.proposed_not_automatic)
+        publisher.D_writeReleaseFiles(False)
+        self.assertNotIn("NotAutomatic: yes", get_release(RELEASE))
+        self.assertNotIn("NotAutomatic: yes", get_release(PROPOSED))
+
+        # But with the flag set, -proposed Release files gain
+        # NotAutomatic: yes and ButAutomaticUpgrades: yes.
+        self.breezy_autotest.proposed_not_automatic = True
+        publisher.D_writeReleaseFiles(False)
+        self.assertNotIn("NotAutomatic: yes", get_release(RELEASE))
+        self.assertIn("NotAutomatic: yes", get_release(PROPOSED))
+        self.assertIn("ButAutomaticUpgrades: yes", get_release(PROPOSED))
+
     def testReleaseFileForI18n(self):
         """Test Release file writing for translated package descriptions."""
         publisher = Publisher(
diff --git a/lib/lp/code/browser/configure.zcml b/lib/lp/code/browser/configure.zcml
index f7bab39..31b3938 100644
--- a/lib/lp/code/browser/configure.zcml
+++ b/lib/lp/code/browser/configure.zcml
@@ -963,6 +963,12 @@
         factory="lp.code.browser.gitrepository.GitRepositoryBreadcrumb"
         permission="zope.Public"/>
 
+  <browser:url
+        for="lp.code.interfaces.gitrepository.IRevisionStatusReport"
+        path_expression="string:+status/${id}"
+        attribute_to_parent="git_repository"
+        rootsite="code"/>
+
     <browser:defaultView
         for="lp.code.interfaces.gitref.IGitRef"
         name="+index"/>
diff --git a/lib/lp/code/browser/gitrepository.py b/lib/lp/code/browser/gitrepository.py
index 92a1b14..ddd79ca 100644
--- a/lib/lp/code/browser/gitrepository.py
+++ b/lib/lp/code/browser/gitrepository.py
@@ -106,6 +106,7 @@ from lp.code.interfaces.gitrepository import (
     ContributorGitIdentity,
     IGitRepository,
     IGitRepositorySet,
+    IRevisionStatusReportSet,
     )
 from lp.code.vocabularies.gitrule import GitPermissionsVocabulary
 from lp.registry.interfaces.person import (
@@ -190,6 +191,18 @@ class GitRepositoryNavigation(WebhookTargetNavigationMixin, Navigation):
 
     usedfor = IGitRepository
 
+    @stepthrough('+status')
+    def traverse_status(self, id):
+        try:
+            report_id = int(id)
+        except ValueError:
+            raise NotFoundError(report_id)
+        report = getUtility(
+            IRevisionStatusReportSet).getByID(report_id)
+        if report is None:
+            raise NotFoundError(report_id)
+        return report
+
     @stepto("+ref")
     def traverse_ref(self):
         segments = list(self.request.getTraversalStack())
diff --git a/lib/lp/code/configure.zcml b/lib/lp/code/configure.zcml
index 6417c89..fb8e0d5 100644
--- a/lib/lp/code/configure.zcml
+++ b/lib/lp/code/configure.zcml
@@ -953,6 +953,40 @@
     <allow interface="lp.code.interfaces.gitref.IGitRefRemoteSet" />
   </securedutility>
 
+  <!-- RevisionStatusReport -->
+
+  <class class="lp.code.model.gitrepository.RevisionStatusReport">
+    <require
+        permission="launchpad.View"
+        interface="lp.code.interfaces.gitrepository.IRevisionStatusReportView
+                   lp.code.interfaces.gitrepository.IRevisionStatusReportEditableAttributes" />
+    <require
+        permission="launchpad.Edit"
+        interface="lp.code.interfaces.gitrepository.IRevisionStatusReportEdit"
+        set_schema="lp.code.interfaces.gitrepository.IRevisionStatusReportEditableAttributes" />
+  </class>
+  <class class="lp.code.model.gitrepository.RevisionStatusArtifact">
+    <require
+        permission="launchpad.View"
+        interface="lp.code.interfaces.gitrepository.IRevisionStatusArtifact" />
+  </class>
+  <class class="lp.code.model.gitrepository.RevisionStatusReportSet">
+    <allow interface="lp.code.interfaces.gitrepository.IRevisionStatusReportSet" />
+  </class>
+  <securedutility
+      class="lp.code.model.gitrepository.RevisionStatusReportSet"
+      provides="lp.code.interfaces.gitrepository.IRevisionStatusReportSet">
+     <allow interface="lp.code.interfaces.gitrepository.IRevisionStatusReportSet" />
+  </securedutility>
+  <class class="lp.code.model.gitrepository.RevisionStatusArtifactSet">
+    <allow interface="lp.code.interfaces.gitrepository.IRevisionStatusArtifactSet" />
+  </class>
+  <securedutility
+      class="lp.code.model.gitrepository.RevisionStatusArtifactSet"
+      provides="lp.code.interfaces.gitrepository.IRevisionStatusArtifactSet">
+     <allow interface="lp.code.interfaces.gitrepository.IRevisionStatusArtifactSet" />
+  </securedutility>
+
   <!-- Git repository access rules -->
 
   <class class="lp.code.model.gitrule.GitRule">
diff --git a/lib/lp/code/enums.py b/lib/lp/code/enums.py
index 3765754..2dbd287 100644
--- a/lib/lp/code/enums.py
+++ b/lib/lp/code/enums.py
@@ -29,6 +29,8 @@ __all__ = [
     'GitRepositoryType',
     'NON_CVS_RCS_TYPES',
     'RevisionControlSystems',
+    'RevisionStatusArtifactType',
+    'RevisionStatusResult',
     'TargetRevisionControlSystems',
     ]
 
@@ -252,6 +254,54 @@ class GitPermissionType(EnumeratedType):
     CAN_FORCE_PUSH = Item("Can force-push")
 
 
+class RevisionStatusArtifactType(DBEnumeratedType):
+    LOG = DBItem(0, """
+        Log
+
+        The log produced by the check job.
+        """)
+
+
+class RevisionStatusResult(DBEnumeratedType):
+    """Revision Status Result"""
+
+    WAITING = DBItem(0, """
+        Waiting
+
+        The check job is waiting to be run.
+        """)
+
+    RUNNING = DBItem(1, """
+        Running
+
+        The check job is currently running.
+        """)
+
+    SUCCEEDED = DBItem(2, """
+        Succeeded
+
+        The check job ran successfully.
+        """)
+
+    FAILED = DBItem(3, """
+        Failed
+
+        The check job failed.
+        """)
+
+    SKIPPED = DBItem(4, """
+        Skipped
+
+        The check job was skipped.
+        """)
+
+    CANCELLED = DBItem(5, """
+        Cancelled
+
+        The check job was cancelled.
+        """)
+
+
 class BranchLifecycleStatusFilter(EnumeratedType):
     """Branch Lifecycle Status Filter
 
diff --git a/lib/lp/code/interfaces/gitrepository.py b/lib/lp/code/interfaces/gitrepository.py
index cb12a5d..aae1b90 100644
--- a/lib/lp/code/interfaces/gitrepository.py
+++ b/lib/lp/code/interfaces/gitrepository.py
@@ -13,9 +13,15 @@ __all__ = [
     'IGitRepositoryExpensiveRequest',
     'IGitRepositorySet',
     'IHasGitRepositoryURL',
+    'IRevisionStatusArtifact',
+    'IRevisionStatusArtifactSet',
+    'IRevisionStatusReport',
+    'IRevisionStatusReportSet',
+    'RevisionStatusReportsFeatureDisabled',
     'user_has_special_git_repository_access',
     ]
 
+import http.client
 import re
 from textwrap import dedent
 
@@ -23,6 +29,7 @@ from lazr.lifecycle.snapshot import doNotSnapshot
 from lazr.restful.declarations import (
     call_with,
     collection_default_content,
+    error_status,
     export_destructor_operation,
     export_factory_operation,
     export_operation_as,
@@ -37,6 +44,7 @@ from lazr.restful.declarations import (
     operation_returns_collection_of,
     operation_returns_entry,
     REQUEST_USER,
+    scoped,
     )
 from lazr.restful.fields import (
     CollectionField,
@@ -50,6 +58,7 @@ from zope.interface import (
     )
 from zope.schema import (
     Bool,
+    Bytes,
     Choice,
     Datetime,
     Int,
@@ -57,10 +66,12 @@ from zope.schema import (
     Text,
     TextLine,
     )
+from zope.security.interfaces import Unauthorized
 
 from lp import _
 from lp.app.enums import InformationType
 from lp.app.validators import LaunchpadValidationError
+from lp.app.validators.attachment import attachment_size_constraint
 from lp.code.enums import (
     BranchMergeProposalStatus,
     BranchSubscriptionDiffSize,
@@ -69,6 +80,8 @@ from lp.code.enums import (
     GitListingSort,
     GitRepositoryStatus,
     GitRepositoryType,
+    RevisionStatusArtifactType,
+    RevisionStatusResult,
     )
 from lp.code.interfaces.defaultgit import ICanHasDefaultGitRepository
 from lp.code.interfaces.hasgitrepositories import IHasGitRepositories
@@ -91,6 +104,7 @@ from lp.services.fields import (
     InlineObject,
     PersonChoice,
     PublicPersonChoice,
+    URIField,
     )
 from lp.services.webhooks.interfaces import IWebhookTarget
 
@@ -813,6 +827,155 @@ class IGitRepositoryExpensiveRequest(Interface):
         that is not an admin or a registry expert."""
 
 
+@error_status(http.client.UNAUTHORIZED)
+class RevisionStatusReportsFeatureDisabled(Unauthorized):
+    """Only certain users can access APIs for revision status reports."""
+
+    def __init__(self):
+        super(RevisionStatusReportsFeatureDisabled, self).__init__(
+            "You do not have permission to create revision status reports")
+
+
+class IRevisionStatusReportView(Interface):
+    """`IRevisionStatusReport` attributes that require launchpad.View."""
+
+    id = Int(title=_("ID"), required=True, readonly=True)
+
+    date_created = exported(Datetime(
+        title=_("When the report was created."), required=True, readonly=True))
+    date_started = exported(Datetime(
+        title=_("When the report was started.")), readonly=False)
+    date_finished = exported(Datetime(
+        title=_("When the report has finished.")), readonly=False)
+
+
+class IRevisionStatusReportEditableAttributes(Interface):
+    """`IRevisionStatusReport` attributes that can be edited.
+
+    These attributes need launchpad.View to see, and launchpad.Edit to change.
+    """
+
+    title = exported(TextLine(
+        title=_("A short title for the report."), required=True))
+
+    git_repository = exported(Reference(
+        title=_("The Git repository for which this report is built."),
+        # Really IGitRepository, patched in _schema_circular_imports.py.
+        schema=Interface, required=True, readonly=True))
+
+    commit_sha1 = exported(TextLine(
+        title=_("The Git commit for which this report is built."),
+        required=True, readonly=True))
+
+    url = exported(URIField(title=_("URL"), required=False, readonly=True,
+                            description=_("The external url of the report.")))
+
+    result_summary = exported(TextLine(
+        title=_("A short summary of the result."), required=False))
+
+    result = exported(Choice(
+        title=_('Result of the report'),  readonly=True,
+        required=False, vocabulary=RevisionStatusResult))
+
+    @mutator_for(result)
+    @operation_parameters(result=copy_field(result))
+    @export_write_operation()
+    @operation_for_version("devel")
+    def transitionToNewResult(result):
+        """Set the RevisionStatusReport result.
+
+        Set the revision status report result."""
+
+
+class IRevisionStatusReportEdit(Interface):
+    """`IRevisionStatusReport` attributes that require launchpad.Edit."""
+
+    @operation_parameters(
+        log_data=Bytes(title=_("The content of the artifact in bytes."),
+                       constraint=attachment_size_constraint))
+    @scoped(AccessTokenScope.REPOSITORY_BUILD_STATUS.title)
+    @export_write_operation()
+    @export_operation_as(name="setLog")
+    @operation_for_version("devel")
+    def api_setLog(log_data):
+        """Set a new log on an existing status report.
+
+        :param log_data: The contents (in bytes) of the log.
+        """
+
+
+@exported_as_webservice_entry(as_of="beta")
+class IRevisionStatusReport(IRevisionStatusReportView,
+                            IRevisionStatusReportEditableAttributes,
+                            IRevisionStatusReportEdit):
+    """An revision status report for a Git commit."""
+
+
+class IRevisionStatusReportSet(Interface):
+    """The set of all revision status reports."""
+
+    def new(creator, title, git_repository, commit_sha1, date_created=None,
+            url=None, result_summary=None, result=None, date_started=None,
+            date_finished=None, log=None):
+        """Return a new revision status report.
+
+        :param title: A text string.
+        :param git_repository: An `IGitRepository` for which the report
+            is being created.
+        :param commit_sha1: The sha1 of the commit for which the report
+            is being created.
+        :param date_created: The date when the report is being created.
+        :param url: External URL to view result of report.
+        :param result_summary: A short summary of the result.
+        :param result: The result of the check job for this revision.
+        :param date_started: DateTime that report was started.
+        :param date_finished: DateTime that report was completed.
+        :param log: Stores the content of the artifact for this report.
+        """
+
+    def getByID(id):
+        """Returns the RevisionStatusReport for a given ID."""
+
+    def findByRepository(repository):
+        """Returns all `RevisionStatusReport` for a repository."""
+
+    def findByCommit(repository, commit_sha1):
+        """Returns all `RevisionStatusReport` for a repository and commit."""
+
+
+class IRevisionStatusArtifactSet(Interface):
+    """The set of all revision status artifacts."""
+
+    def new(lfa, report):
+        """Return a new revision status artifact.
+
+        :param lfa: An `ILibraryFileAlias`.
+        :param report: An `IRevisionStatusReport` for which the
+            artifact is being created.
+        """
+
+    def getByID(id):
+        """Returns the RevisionStatusArtifact for a given ID."""
+
+    def findByReport(report):
+        """Returns the set of artifacts for a given report."""
+
+
+class IRevisionStatusArtifact(Interface):
+    id = Int(title=_("ID"), required=True, readonly=True)
+
+    report = Attribute(
+        "The `RevisionStatusReport` that this artifact is linked to.")
+
+    library_file = Attribute(
+        "The `LibraryFileAlias` object containing information for "
+        "a revision status report.")
+
+    artifact_type = Choice(
+        title=_('The type of artifact, only log for now.'),
+        vocabulary=RevisionStatusArtifactType)
+
+
 class IGitRepositoryEdit(IWebhookTarget, IAccessTokenTarget):
     """IGitRepository methods that require launchpad.Edit permission."""
 
@@ -1015,6 +1178,38 @@ class IGitRepositoryEdit(IWebhookTarget, IAccessTokenTarget):
         :raise: CannotDeleteGitRepository if the repository cannot be deleted.
         """
 
+    @operation_parameters(
+        title=copy_field(IRevisionStatusReport["title"]),
+        commit_sha1=copy_field(IRevisionStatusReport["commit_sha1"]),
+        url=copy_field(IRevisionStatusReport["url"]),
+        result_summary=copy_field(IRevisionStatusReport["result_summary"]),
+        result=copy_field(IRevisionStatusReport["result"]))
+    @scoped(AccessTokenScope.REPOSITORY_BUILD_STATUS.title)
+    @call_with(user=REQUEST_USER)
+    @export_factory_operation(IRevisionStatusReport, [])
+    @operation_for_version("devel")
+    def newStatusReport(title, commit_sha1, url, result_summary, result, user):
+        """Create a new status report.
+
+        :param title: The name of the new report.
+        :param commit_sha1: The commit sha1 for the report.
+        :param url: The external link of the status report.
+        :param result_summary: The description of the new report.
+        :param result: The result of the new report.
+        """
+
+    @operation_parameters(
+        commit_sha1=copy_field(IRevisionStatusReport["commit_sha1"]))
+    @scoped(AccessTokenScope.REPOSITORY_BUILD_STATUS.title)
+    @operation_returns_collection_of(Interface)
+    @export_read_operation()
+    @operation_for_version("devel")
+    def getStatusReports(commit_sha1):
+        """Retrieves the list of reports that exist for a commit.
+
+        :param commit_sha1: The commit sha1 for the report.
+        """
+
 
 # XXX cjwatson 2015-01-19 bug=760849: "beta" is a lie to get WADL
 # generation working.  Individual attributes must set their version to
diff --git a/lib/lp/code/interfaces/webservice.py b/lib/lp/code/interfaces/webservice.py
index 02546e9..bd94298 100644
--- a/lib/lp/code/interfaces/webservice.py
+++ b/lib/lp/code/interfaces/webservice.py
@@ -31,6 +31,7 @@ __all__ = [
     'IGitSubscription',
     'IHasGitRepositories',
     'IPreviewDiff',
+    'IRevisionStatusReport',
     'ISourcePackageRecipe',
     'ISourcePackageRecipeBuild',
     ]
@@ -66,6 +67,7 @@ from lp.code.interfaces.gitref import IGitRef
 from lp.code.interfaces.gitrepository import (
     IGitRepository,
     IGitRepositorySet,
+    IRevisionStatusReport,
     )
 from lp.code.interfaces.gitsubscription import IGitSubscription
 from lp.code.interfaces.hasgitrepositories import IHasGitRepositories
diff --git a/lib/lp/code/model/gitrepository.py b/lib/lp/code/model/gitrepository.py
index 812f1d7..43a005a 100644
--- a/lib/lp/code/model/gitrepository.py
+++ b/lib/lp/code/model/gitrepository.py
@@ -6,6 +6,7 @@ __all__ = [
     'GitRepository',
     'GitRepositorySet',
     'parse_git_commits',
+    'RevisionStatusReport',
     ]
 
 from collections import (
@@ -19,6 +20,7 @@ from datetime import (
 import email
 from fnmatch import fnmatch
 from functools import partial
+import io
 from itertools import (
     chain,
     groupby,
@@ -102,6 +104,8 @@ from lp.code.enums import (
     GitPermissionType,
     GitRepositoryStatus,
     GitRepositoryType,
+    RevisionStatusArtifactType,
+    RevisionStatusResult,
     )
 from lp.code.errors import (
     CannotDeleteGitRepository,
@@ -131,6 +135,10 @@ from lp.code.interfaces.gitrepository import (
     GitIdentityMixin,
     IGitRepository,
     IGitRepositorySet,
+    IRevisionStatusArtifactSet,
+    IRevisionStatusReport,
+    IRevisionStatusReportSet,
+    RevisionStatusReportsFeatureDisabled,
     user_has_special_git_repository_access,
     )
 from lp.code.interfaces.gitrule import (
@@ -205,6 +213,7 @@ from lp.services.identity.interfaces.account import (
     )
 from lp.services.job.interfaces.job import JobStatus
 from lp.services.job.model.job import Job
+from lp.services.librarian.interfaces import ILibraryFileAliasSet
 from lp.services.macaroons.interfaces import IMacaroonIssuer
 from lp.services.macaroons.model import MacaroonIssuerBase
 from lp.services.mail.notificationrecipientset import NotificationRecipientSet
@@ -219,8 +228,9 @@ from lp.services.webhooks.model import WebhookTargetMixin
 from lp.snappy.interfaces.snap import ISnapSet
 
 
-logger = logging.getLogger(__name__)
+REVISION_STATUS_REPORT_ALLOW_CREATE = 'revision_status_report.allow_create'
 
+logger = logging.getLogger(__name__)
 
 object_type_map = {
     "commit": GitObjectType.COMMIT,
@@ -292,6 +302,139 @@ def git_repository_modified(repository, event):
     send_git_repository_modified_notifications(repository, event)
 
 
+@implementer(IRevisionStatusReport)
+class RevisionStatusReport(StormBase):
+    __storm_table__ = 'RevisionStatusReport'
+
+    id = Int(primary=True)
+
+    creator_id = Int(name="creator", allow_none=False)
+    creator = Reference(creator_id, "Person.id")
+
+    title = Unicode(name='name', allow_none=False)
+
+    git_repository_id = Int(name='git_repository', allow_none=False)
+    git_repository = Reference(git_repository_id, 'GitRepository.id')
+
+    commit_sha1 = Unicode(name='commit_sha1', allow_none=False)
+
+    url = Unicode(name='url', allow_none=True)
+
+    result_summary = Unicode(name='description', allow_none=True)
+
+    result = DBEnum(name='result', allow_none=True, enum=RevisionStatusResult)
+
+    date_created = DateTime(
+        name='date_created', tzinfo=pytz.UTC, allow_none=False)
+
+    date_started = DateTime(name='date_started', tzinfo=pytz.UTC,
+                            allow_none=True)
+    date_finished = DateTime(name='date_finished', tzinfo=pytz.UTC,
+                             allow_none=True)
+
+    def __init__(self, git_repository, user, title, commit_sha1,
+                 url, result_summary, result):
+        super().__init__()
+        self.creator = user
+        self.git_repository = git_repository
+        self.title = title
+        self.commit_sha1 = commit_sha1
+        self.url = url
+        self.result_summary = result_summary
+        self.result = result
+        self.date_created = UTC_NOW
+
+    def api_setLog(self, log_data):
+        filename = '%s-%s.txt' % (self.title, self.commit_sha1)
+
+        lfa = getUtility(ILibraryFileAliasSet).create(
+            name=filename, size=len(log_data),
+            file=io.BytesIO(log_data), contentType='text/plain')
+
+        getUtility(IRevisionStatusArtifactSet).new(lfa, self)
+
+    def transitionToNewResult(self, result):
+        if self.result == RevisionStatusResult.WAITING:
+            if result == RevisionStatusResult.RUNNING:
+                self.date_started == UTC_NOW
+        else:
+            self.date_finished = UTC_NOW
+        self.result = result
+
+
+@implementer(IRevisionStatusReportSet)
+class RevisionStatusReportSet:
+
+    def new(self, creator, title, git_repository, commit_sha1,
+            url=None, result_summary=None, result=None,
+            date_started=None, date_finished=None, log=None):
+        """See `IRevisionStatusReportSet`."""
+        store = IStore(RevisionStatusReport)
+        report = RevisionStatusReport(git_repository, creator, title,
+                                      commit_sha1, url, result_summary,
+                                      result)
+        store.add(report)
+        return report
+
+    def getByID(self, id):
+        return IStore(
+            RevisionStatusReport).find(RevisionStatusReport, id=id).one()
+
+    def findByRepository(self, repository):
+        return IStore(RevisionStatusReport).find(
+            RevisionStatusReport,
+            RevisionStatusReport.git_repository == repository)
+
+    def findByCommit(self, repository, commit_sha1):
+        """Returns all `RevisionStatusReport` for a repository and commit."""
+        return IStore(RevisionStatusReport).find(
+            RevisionStatusReport,
+            git_repository=repository,
+            commit_sha1=commit_sha1)
+
+
+class RevisionStatusArtifact(StormBase):
+    __storm_table__ = 'RevisionStatusArtifact'
+
+    id = Int(primary=True)
+
+    library_file_id = Int(name='library_file', allow_none=False)
+    library_file = Reference(library_file_id, 'LibraryFileAlias.id')
+
+    report_id = Int(name='report', allow_none=False)
+    report = Reference(report_id, 'RevisionStatusReport.id')
+
+    artifact_type = DBEnum(name='type', allow_none=False,
+                           enum=RevisionStatusArtifactType)
+
+    def __init__(self, library_file, report):
+        super().__init__()
+        self.library_file = library_file
+        self.report = report
+        self.artifact_type = RevisionStatusArtifactType.LOG
+
+
+@implementer(IRevisionStatusArtifactSet)
+class RevisionStatusArtifactSet:
+
+    def new(self, lfa, report):
+        """See `IRevisionStatusArtifactSet`."""
+        store = IStore(RevisionStatusArtifact)
+        artifact = RevisionStatusArtifact(lfa, report)
+        store.add(artifact)
+        return artifact
+
+    def getById(self, id):
+        return IStore(RevisionStatusArtifact).find(
+            RevisionStatusArtifact,
+            RevisionStatusArtifact.id == id).one()
+
+    def findByReport(self, report):
+        return IStore(RevisionStatusArtifact).find(
+            RevisionStatusArtifact,
+            RevisionStatusArtifact.report == report)
+
+
 @implementer(IGitRepository, IHasOwner, IPrivacy, IInformationType)
 class GitRepository(StormBase, WebhookTargetMixin, AccessTokenTargetMixin,
                     GitIdentityMixin):
@@ -501,6 +644,20 @@ class GitRepository(StormBase, WebhookTargetMixin, AccessTokenTargetMixin,
     def collectGarbage(self):
         getUtility(IGitHostingClient).collectGarbage(self.getInternalPath())
 
+    def newStatusReport(self, user, title, commit_sha1, url=None,
+                        result_summary=None, result=None):
+
+        if not getFeatureFlag(REVISION_STATUS_REPORT_ALLOW_CREATE):
+            raise RevisionStatusReportsFeatureDisabled()
+
+        report = RevisionStatusReport(self, user, title, commit_sha1,
+                                      url, result_summary, result)
+        return report
+
+    def getStatusReports(self, commit_sha1):
+        return getUtility(
+                IRevisionStatusReportSet).findByCommit(self, commit_sha1)
+
     @property
     def namespace(self):
         """See `IGitRepository`."""
diff --git a/lib/lp/code/model/tests/test_gitrepository.py b/lib/lp/code/model/tests/test_gitrepository.py
index 252b535..6a759be 100644
--- a/lib/lp/code/model/tests/test_gitrepository.py
+++ b/lib/lp/code/model/tests/test_gitrepository.py
@@ -10,6 +10,7 @@ from datetime import (
 import email
 from functools import partial
 import hashlib
+import io
 import json
 
 from breezy import urlutils
@@ -65,6 +66,7 @@ from lp.code.enums import (
     GitObjectType,
     GitRepositoryStatus,
     GitRepositoryType,
+    RevisionStatusResult,
     TargetRevisionControlSystems,
     )
 from lp.code.errors import (
@@ -95,6 +97,8 @@ from lp.code.interfaces.gitrepository import (
     IGitRepository,
     IGitRepositorySet,
     IGitRepositoryView,
+    IRevisionStatusArtifactSet,
+    IRevisionStatusReportSet,
     )
 from lp.code.interfaces.gitrule import (
     IGitNascentRule,
@@ -121,6 +125,7 @@ from lp.code.model.gitrepository import (
     DeletionCallable,
     DeletionOperation,
     GitRepository,
+    REVISION_STATUS_REPORT_ALLOW_CREATE,
     )
 from lp.code.tests.helpers import GitHostingFixture
 from lp.code.xmlrpc.git import GitAPI
@@ -571,6 +576,24 @@ class TestGitRepository(TestCaseWithFactory):
         self.assertThat(recorder2, HasQueryCount.byEquality(recorder1))
         self.assertEqual(7, recorder1.count)
 
+    def test_findRevisionStatusReport(self):
+        repository = removeSecurityProxy(self.factory.makeGitRepository())
+        title = self.factory.getUniqueUnicode('report-title')
+        commit_sha1 = hashlib.sha1(b"Some content").hexdigest()
+        result_summary = "120/120 tests passed"
+
+        report = self.factory.makeRevisionStatusReport(
+            user=repository.owner, git_repository=repository,
+            title=title, commit_sha1=commit_sha1,
+            result_summary=result_summary,
+            result=RevisionStatusResult.SUCCEEDED)
+
+        with person_logged_in(repository.owner):
+            result = getUtility(
+                IRevisionStatusReportSet).getByID(
+                report.id)
+            self.assertEqual(report, result)
+
 
 class TestGitIdentityMixin(TestCaseWithFactory):
     """Test the defaults and identities provided by GitIdentityMixin."""
@@ -4241,6 +4264,126 @@ class TestGitRepositoryWebservice(TestCaseWithFactory):
             self.assertEqual(
                 InformationType.PUBLIC, repository_db.information_type)
 
+    def test_newRevisionStatusReport_featureFlagDisabled(self):
+        repository = self.factory.makeGitRepository()
+        requester = repository.owner
+        webservice = webservice_for_person(None, default_api_version="devel")
+        with person_logged_in(requester):
+            repository_url = api_url(repository)
+
+            secret, _ = self.factory.makeAccessToken(
+                owner=requester, target=repository,
+                scopes=[AccessTokenScope.REPOSITORY_BUILD_STATUS])
+            header = {'Authorization': 'Token %s' % secret}
+
+        response = webservice.named_post(
+            repository_url, "newStatusReport",
+            headers=header, title="CI",
+            commit_sha1=hashlib.sha1(
+                self.factory.getUniqueBytes()).hexdigest(),
+            url='https://launchpad.net/',
+            result_summary="120/120 tests passed",
+            result="Succeeded")
+
+        self.assertEqual(401, response.status)
+        self.assertIn(
+            b'You do not have permission to create revision status reports',
+            response.body)
+
+    def test_newRevisionStatusReport(self):
+        repository = self.factory.makeGitRepository()
+        requester = repository.owner
+        webservice = webservice_for_person(None, default_api_version="devel")
+        with person_logged_in(requester):
+            repository_url = api_url(repository)
+
+            secret, _ = self.factory.makeAccessToken(
+                owner=requester, target=repository,
+                scopes=[AccessTokenScope.REPOSITORY_BUILD_STATUS])
+            header = {'Authorization': 'Token %s' % secret}
+
+        self.useFixture(FeatureFixture(
+            {REVISION_STATUS_REPORT_ALLOW_CREATE: "on"}))
+
+        response = webservice.named_post(
+            repository_url, "newStatusReport",
+            headers=header, title="CI",
+            commit_sha1=hashlib.sha1(
+                self.factory.getUniqueBytes()).hexdigest(),
+            url='https://launchpad.net/',
+            result_summary="120/120 tests passed",
+            result="Succeeded")
+        self.assertEqual(201, response.status)
+
+        with person_logged_in(requester):
+            results = getUtility(
+                IRevisionStatusReportSet).findByRepository(repository)
+            reports = list(results)
+            urls = [webservice.getAbsoluteUrl('%s/+status/%s' % (
+                api_url(repository),
+                report.id)) for report in reports]
+            self.assertIn(response.getHeader("Location"), urls)
+
+    def test_getRevisionStatusReports(self):
+        repository = self.factory.makeGitRepository()
+        repository2 = self.factory.makeGitRepository()
+        requester = repository.owner
+        title = self.factory.getUniqueUnicode('report-title')
+        result_summary = "120/120 tests passed"
+        commit_sha1s = [hashlib.sha1(
+            self.factory.getUniqueBytes()).hexdigest() for _ in range(2)]
+
+        result_summary2 = "Lint"
+        title2 = "Invalid import in test_file.py"
+
+        report1 = self.factory.makeRevisionStatusReport(
+            user=repository.owner, git_repository=repository,
+            title=title, commit_sha1=commit_sha1s[0],
+            result_summary=result_summary,
+            result=RevisionStatusResult.SUCCEEDED)
+
+        report2 = self.factory.makeRevisionStatusReport(
+            user=repository.owner, git_repository=repository,
+            title=title2, commit_sha1=commit_sha1s[0],
+            result_summary=result_summary2,
+            result=RevisionStatusResult.FAILED)
+
+        self.factory.makeRevisionStatusReport(
+            user=repository.owner, git_repository=repository,
+            title=title2, commit_sha1=commit_sha1s[1],
+            result_summary=result_summary2,
+            result=RevisionStatusResult.FAILED)
+
+        self.factory.makeRevisionStatusReport(
+            user=repository.owner, git_repository=repository2,
+            title=title2, commit_sha1=commit_sha1s[0],
+            result_summary=result_summary2,
+            result=RevisionStatusResult.FAILED)
+
+        webservice = webservice_for_person(None, default_api_version="devel")
+        with person_logged_in(requester):
+            repository_url = api_url(repository)
+
+            secret, _ = self.factory.makeAccessToken(
+                owner=requester, target=repository,
+                scopes=[AccessTokenScope.REPOSITORY_BUILD_STATUS])
+            header = {'Authorization': 'Token %s' % secret}
+
+        self.useFixture(FeatureFixture(
+            {REVISION_STATUS_REPORT_ALLOW_CREATE: "on"}))
+
+        response = webservice.named_get(
+            repository_url, "getStatusReports",
+            headers=header,
+            commit_sha1=commit_sha1s[0])
+        self.assertEqual(200, response.status)
+        with person_logged_in(requester):
+            result = getUtility(
+                IRevisionStatusReportSet).findByCommit(
+                repository, commit_sha1s[0])
+
+        self.assertContentEqual([report1, report2], result)
+
     def test_set_target(self):
         # The repository owner can move the repository to another target;
         # this redirects to the new location.
@@ -4831,6 +4974,60 @@ class TestGitRepositoryWebservice(TestCaseWithFactory):
             response.body)
 
 
+class TestRevisionStatusReportWebservice(TestCaseWithFactory):
+    layer = LaunchpadFunctionalLayer
+
+    def setUp(self):
+        super(TestRevisionStatusReportWebservice, self).setUp()
+        self.repository = self.factory.makeGitRepository()
+        self.requester = self.repository.owner
+        title = self.factory.getUniqueUnicode('report-title')
+        commit_sha1 = hashlib.sha1(b"Some content").hexdigest()
+        result_summary = "120/120 tests passed"
+
+        self.report = self.factory.makeRevisionStatusReport(
+            user=self.repository.owner, git_repository=self.repository,
+            title=title, commit_sha1=commit_sha1,
+            result_summary=result_summary,
+            result=RevisionStatusResult.SUCCEEDED)
+
+        self.webservice = webservice_for_person(
+            None, default_api_version="devel")
+        with person_logged_in(self.requester):
+            self.report_url = api_url(self.report)
+
+            secret, _ = self.factory.makeAccessToken(
+                owner=self.requester, target=self.repository,
+                scopes=[AccessTokenScope.REPOSITORY_BUILD_STATUS])
+            self.header = {'Authorization': 'Token %s' % secret}
+
+    def test_setLogOnRevisionStatusReport(self):
+        content = b'log_content_data'
+        filesize = len(content)
+        sha1 = hashlib.sha1(content).hexdigest()
+        md5 = hashlib.md5(content).hexdigest()
+        response = self.webservice.named_post(
+            self.report_url, "setLog",
+            headers=self.header,
+            log_data=io.BytesIO(content))
+        self.assertEqual(200, response.status)
+
+        # A report may have multiple artifacts.
+        # We verify that the content we just submitted via API now
+        # matches one of the artifacts in the DB for the report.
+        with person_logged_in(self.requester):
+            artifacts = list(getUtility(
+                IRevisionStatusArtifactSet).findByReport(self.report))
+            lfcs = [artifact.library_file.content for artifact in artifacts]
+            sha1_of_all_artifacts = [lfc.sha1 for lfc in lfcs]
+            md5_of_all_artifacts = [lfc.md5 for lfc in lfcs]
+            filesizes_of_all_artifacts = [lfc.filesize for lfc in lfcs]
+
+            self.assertIn(sha1, sha1_of_all_artifacts)
+            self.assertIn(md5, md5_of_all_artifacts)
+            self.assertIn(filesize, filesizes_of_all_artifacts)
+
+
 class TestGitRepositoryMacaroonIssuer(MacaroonTestMixin, TestCaseWithFactory):
     """Test GitRepository macaroon issuing and verification."""
 
diff --git a/lib/lp/registry/configure.zcml b/lib/lp/registry/configure.zcml
index 9d07930..0ccf396 100644
--- a/lib/lp/registry/configure.zcml
+++ b/lib/lp/registry/configure.zcml
@@ -1,4 +1,4 @@
-<!-- Copyright 2009-2020 Canonical Ltd.  This software is licensed under the
+<!-- Copyright 2009-2021 Canonical Ltd.  This software is licensed under the
      GNU Affero General Public License version 3 (see the file LICENSE).
 -->
 
@@ -326,6 +326,7 @@
                 description
                 driver
                 backports_not_automatic
+                proposed_not_automatic
                 include_long_descriptions
                 index_compressors
                 publish_by_hash
diff --git a/lib/lp/registry/doc/distribution-mirror.txt b/lib/lp/registry/doc/distribution-mirror.txt
index 8939a83..2c7cac5 100644
--- a/lib/lp/registry/doc/distribution-mirror.txt
+++ b/lib/lp/registry/doc/distribution-mirror.txt
@@ -367,11 +367,14 @@ up on the public mirror listings.
     >>> import email
     >>> from lp.services.mail import stub
     >>> len(stub.test_emails)
-    2
+    3
     >>> stub.test_emails.sort(key=lambda e: sorted(e[1]))  # sort by to_addr
     >>> from_addr, to_addrs, raw_message = stub.test_emails.pop(0)
     >>> print(pretty(sorted(to_addrs)))
-    ['[e-mail]', '[e-mail]']
+    ['[e-mail]']
+    >>> from_addr, to_addrs, raw_message = stub.test_emails.pop(0)
+    >>> print(pretty(sorted(to_addrs)))
+    ['[e-mail]']
     >>> from_addr, to_addrs, raw_message = stub.test_emails.pop(0)
     >>> print(pretty(sorted(to_addrs)))
     ['[e-mail]']
@@ -401,10 +404,14 @@ single notification to the distribution's mirror admins.
     >>> valid_mirror.disable(notify_owner=False, log=log)
     >>> transaction.commit()
     >>> len(stub.test_emails)
-    1
-    >>> from_addr, to_addrs, raw_message = stub.test_emails.pop()
+    2
+    >>> stub.test_emails.sort(key=lambda e: sorted(e[1]))  # sort by to_addr
+    >>> from_addr, to_addrs, raw_message = stub.test_emails.pop(0)
     >>> print(pretty(sorted(to_addrs)))
-    ['[e-mail]', '[e-mail]']
+    ['[e-mail]']
+    >>> from_addr, to_addrs, raw_message = stub.test_emails.pop(0)
+    >>> print(pretty(sorted(to_addrs)))
+    ['[e-mail]']
 
     Now we delete the MirrorProbeRecord we've just created, to make
     sure this mirror is probed by our prober script.
diff --git a/lib/lp/registry/interfaces/distroseries.py b/lib/lp/registry/interfaces/distroseries.py
index 848cf6d..da0e19e 100644
--- a/lib/lp/registry/interfaces/distroseries.py
+++ b/lib/lp/registry/interfaces/distroseries.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2020 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Interfaces including and related to IDistroSeries."""
@@ -373,6 +373,15 @@ class IDistroSeriesPublic(
             automatically upgrade within backports, but not into it.
             """))
 
+    proposed_not_automatic = Bool(
+        title=_("Don't upgrade to proposed updates automatically"),
+        required=True,
+        description=_("""
+            Set NotAutomatic: yes and ButAutomaticUpgrades: yes in Release
+            files generated for the proposed pocket. This tells apt to
+            automatically upgrade within proposed, but not into it.
+            """))
+
     include_long_descriptions = exported(
         Bool(
             title=_(
diff --git a/lib/lp/registry/model/distributionmirror.py b/lib/lp/registry/model/distributionmirror.py
index 8d3bd82..2454187 100644
--- a/lib/lp/registry/model/distributionmirror.py
+++ b/lib/lp/registry/model/distributionmirror.py
@@ -385,13 +385,14 @@ class DistributionMirror(SQLBase):
         message = template % replacements
         subject = "Launchpad: Verification of %s failed" % self.name
 
-        mirror_admin_address = get_contact_email_addresses(
+        mirror_admin_addresses = get_contact_email_addresses(
             self.distribution.mirror_admin)
-        simple_sendmail(fromaddress, mirror_admin_address, subject, message)
+        for admin_address in mirror_admin_addresses:
+            simple_sendmail(fromaddress, admin_address, subject, message)
 
         if notify_owner:
-            owner_address = get_contact_email_addresses(self.owner)
-            if len(owner_address) > 0:
+            owner_addresses = get_contact_email_addresses(self.owner)
+            for owner_address in owner_addresses:
                 simple_sendmail(fromaddress, owner_address, subject, message)
 
     def newProbeRecord(self, log_file):
diff --git a/lib/lp/registry/model/distroseries.py b/lib/lp/registry/model/distroseries.py
index 2ad609c..167aa8e 100644
--- a/lib/lp/registry/model/distroseries.py
+++ b/lib/lp/registry/model/distroseries.py
@@ -279,6 +279,7 @@ class DistroSeries(SQLBase, BugTargetBase, HasSpecificationsMixin,
         if "publishing_options" not in kwargs:
             kwargs["publishing_options"] = {
                 "backports_not_automatic": False,
+                "proposed_not_automatic": False,
                 "include_long_descriptions": True,
                 "index_compressors": [
                     compressor.title
@@ -828,6 +829,15 @@ class DistroSeries(SQLBase, BugTargetBase, HasSpecificationsMixin,
         self.publishing_options["backports_not_automatic"] = value
 
     @property
+    def proposed_not_automatic(self):
+        return self.publishing_options.get("proposed_not_automatic", False)
+
+    @proposed_not_automatic.setter
+    def proposed_not_automatic(self, value):
+        assert isinstance(value, bool)
+        self.publishing_options["proposed_not_automatic"] = value
+
+    @property
     def include_long_descriptions(self):
         return self.publishing_options.get("include_long_descriptions", True)
 
diff --git a/lib/lp/registry/model/person.py b/lib/lp/registry/model/person.py
index 36be643..ad7fd53 100644
--- a/lib/lp/registry/model/person.py
+++ b/lib/lp/registry/model/person.py
@@ -2661,7 +2661,7 @@ class Person(
         for address in all_addresses:
             # Delete all email addresses that are not the preferred email
             # address, or the team's email address. If this method was called
-            # with None, and there is no mailing list, then this condidition
+            # with None, and there is no mailing list, then this condition
             # is (None, None), causing all email addresses to be deleted.
             if address not in (email, mailing_list_email):
                 address.destroySelf()
diff --git a/lib/lp/registry/tests/test_distributionmirror.py b/lib/lp/registry/tests/test_distributionmirror.py
index 08dae43..8f1423d 100644
--- a/lib/lp/registry/tests/test_distributionmirror.py
+++ b/lib/lp/registry/tests/test_distributionmirror.py
@@ -170,14 +170,22 @@ class TestDistributionMirror(TestCaseWithFactory):
         mirror.disable(notify_owner=True, log=log)
         # A notification was sent to the owner and other to the mirror admins.
         transaction.commit()
-        self.assertEqual(len(stub.test_emails), 2)
+        self.assertEqual(len(stub.test_emails), 3)
+
+        # In order to prevent data disclosure, emails have to be sent to one
+        # person each, ie it is not allowed to have multiple recipients in an
+        # email's `to` field.
+        for email in stub.test_emails:
+            number_of_to_addresses = len(email[1])
+            self.assertLess(number_of_to_addresses, 2)
+
         stub.test_emails = []
 
         mirror.disable(notify_owner=True, log=log)
         # Again, a notification was sent to the owner and other to the mirror
         # admins.
         transaction.commit()
-        self.assertEqual(len(stub.test_emails), 2)
+        self.assertEqual(len(stub.test_emails), 3)
         stub.test_emails = []
 
         # For mirrors that have been probed more than once, we'll only notify
@@ -187,7 +195,7 @@ class TestDistributionMirror(TestCaseWithFactory):
         mirror.disable(notify_owner=True, log=log)
         # A notification was sent to the owner and other to the mirror admins.
         transaction.commit()
-        self.assertEqual(len(stub.test_emails), 2)
+        self.assertEqual(len(stub.test_emails), 3)
         stub.test_emails = []
 
         # We can always disable notifications to the owner by passing
@@ -195,7 +203,7 @@ class TestDistributionMirror(TestCaseWithFactory):
         mirror.enabled = True
         mirror.disable(notify_owner=False, log=log)
         transaction.commit()
-        self.assertEqual(len(stub.test_emails), 1)
+        self.assertEqual(len(stub.test_emails), 2)
         stub.test_emails = []
 
         mirror.enabled = False
@@ -217,12 +225,12 @@ class TestDistributionMirror(TestCaseWithFactory):
         transaction.commit()
         stub.test_emails = []
 
-        # Disabling the mirror results in a single notification to the
-        # mirror admins.
+        # Disabling the mirror results in one notification for each of
+        # the three mirror admins.
         self.factory.makeMirrorProbeRecord(mirror)
         mirror.disable(notify_owner=True, log="It broke.")
         transaction.commit()
-        self.assertEqual(len(stub.test_emails), 1)
+        self.assertEqual(len(stub.test_emails), 3)
 
     def test_permissions_for_resubmit(self):
         self.assertRaises(
diff --git a/lib/lp/registry/tests/test_distroseries.py b/lib/lp/registry/tests/test_distroseries.py
index 1543eca..d67e499 100644
--- a/lib/lp/registry/tests/test_distroseries.py
+++ b/lib/lp/registry/tests/test_distroseries.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for distroseries."""
@@ -358,6 +358,16 @@ class TestDistroSeries(TestCaseWithFactory):
         self.assertTrue(
             naked_distroseries.publishing_options["backports_not_automatic"])
 
+    def test_proposed_not_automatic(self):
+        distroseries = self.factory.makeDistroSeries()
+        self.assertFalse(distroseries.proposed_not_automatic)
+        with admin_logged_in():
+            distroseries.proposed_not_automatic = True
+        self.assertTrue(distroseries.proposed_not_automatic)
+        naked_distroseries = removeSecurityProxy(distroseries)
+        self.assertTrue(
+            naked_distroseries.publishing_options["proposed_not_automatic"])
+
     def test_include_long_descriptions(self):
         distroseries = self.factory.makeDistroSeries()
         self.assertTrue(distroseries.include_long_descriptions)
diff --git a/lib/lp/security.py b/lib/lp/security.py
index 8f66fbb..8435167 100644
--- a/lib/lp/security.py
+++ b/lib/lp/security.py
@@ -99,6 +99,8 @@ from lp.code.interfaces.gitcollection import IGitCollection
 from lp.code.interfaces.gitref import IGitRef
 from lp.code.interfaces.gitrepository import (
     IGitRepository,
+    IRevisionStatusArtifact,
+    IRevisionStatusReport,
     user_has_special_git_repository_access,
     )
 from lp.code.interfaces.gitrule import (
@@ -683,6 +685,23 @@ class EditSpecificationByRelatedPeople(AuthorizationBase):
                     self.obj, ['owner', 'drafter', 'assignee', 'approver']))
 
 
+class EditRevisionStatusReport(AuthorizationBase):
+    """The owner of a Git repository can edit its status reports."""
+    permission = 'launchpad.Edit'
+    usedfor = IRevisionStatusReport
+
+    def checkAuthenticated(self, user):
+        return user.isOwner(self.obj.git_repository)
+
+
+class EditRevisionStatusArtifact(DelegatedAuthorization):
+    permission = 'launchpad.Edit'
+    usedfor = IRevisionStatusArtifact
+
+    def __init__(self, obj):
+        super().__init__(obj, obj.report, 'launchpad.Edit')
+
+
 class AdminSpecification(AuthorizationBase):
     permission = 'launchpad.Admin'
     usedfor = ISpecification
diff --git a/lib/lp/services/config/schema-lazr.conf b/lib/lp/services/config/schema-lazr.conf
index 5472dbc..73bfb70 100644
--- a/lib/lp/services/config/schema-lazr.conf
+++ b/lib/lp/services/config/schema-lazr.conf
@@ -1332,6 +1332,10 @@ old_os_tenant_name: none
 # datatype: string
 old_os_auth_version: 2.0
 
+# Time in seconds to wait for a response from Swift.
+# datatype: integer
+swift_timeout: 15
+
 
 # Mailman configuration.  Most of this is configured in
 # https://git.launchpad.net/lp-mailman instead; the entries here are only
diff --git a/lib/lp/services/librarianserver/swift.py b/lib/lp/services/librarianserver/swift.py
index d844d50..4a1139d 100644
--- a/lib/lp/services/librarianserver/swift.py
+++ b/lib/lp/services/librarianserver/swift.py
@@ -426,6 +426,7 @@ class ConnectionPool:
             key=self.os_password,
             tenant_name=self.os_tenant_name,
             auth_version=self.os_auth_version,
+            timeout=float(config.librarian_server.swift_timeout),
             )
 
 
diff --git a/lib/lp/services/librarianserver/tests/test_swift.py b/lib/lp/services/librarianserver/tests/test_swift.py
index 98595b6..ecdb6d9 100644
--- a/lib/lp/services/librarianserver/tests/test_swift.py
+++ b/lib/lp/services/librarianserver/tests/test_swift.py
@@ -363,6 +363,15 @@ class TestFeedSwift(TestCase):
             finally:
                 swift_client.close()
 
+    def test_swift_timeout(self):
+        # The librarian's Swift connections honour the configured timeout.
+        self.pushConfig(
+            'librarian_server', os_username='timeout', swift_timeout=0.1)
+        swift_client = self.swift_fixture.connect()
+        self.assertRaises(
+            swiftclient.ClientException,
+            swift_client.get_object, 'container', 'name')
+
 
 class TestHashStream(TestCase):
     layer = BaseLayer
diff --git a/lib/lp/services/webapp/tests/test_servers.py b/lib/lp/services/webapp/tests/test_servers.py
index a5ffe0a..7b288fe 100644
--- a/lib/lp/services/webapp/tests/test_servers.py
+++ b/lib/lp/services/webapp/tests/test_servers.py
@@ -897,6 +897,14 @@ class TestWebServiceAccessTokens(TestCaseWithFactory):
             repository,
             ["repository:build_status", "repository:another_scope"])
 
+    def test_checkRequest_contains_context(self):
+        [ref] = self.factory.makeGitRefs()
+        self._makeAccessTokenVerifiedRequest(
+            target=ref.repository,
+            scopes=[AccessTokenScope.REPOSITORY_BUILD_STATUS])
+        getUtility(IWebServiceConfiguration).checkRequest(
+            ref, ["repository:build_status", "repository:another_scope"])
+
     def test_checkRequest_bad_context(self):
         repository = self.factory.makeGitRepository()
         self._makeAccessTokenVerifiedRequest(
diff --git a/lib/lp/services/webservice/configuration.py b/lib/lp/services/webservice/configuration.py
index 8b56842..665c64e 100644
--- a/lib/lp/services/webservice/configuration.py
+++ b/lib/lp/services/webservice/configuration.py
@@ -15,8 +15,13 @@ from zope.security.interfaces import Unauthorized
 from lp.app import versioninfo
 from lp.services.config import config
 from lp.services.database.sqlbase import block_implicit_flushes
+from lp.services.webapp.canonicalurl import nearest_adapter
 from lp.services.webapp.interaction import get_interaction_extras
-from lp.services.webapp.interfaces import ILaunchBag
+from lp.services.webapp.interfaces import (
+    ILaunchBag,
+    ILaunchpadContainer,
+    )
+from lp.services.webapp.publisher import canonical_url
 from lp.services.webapp.servers import (
     WebServiceClientRequest,
     WebServicePublication,
@@ -102,9 +107,19 @@ class LaunchpadWebServiceConfiguration(BaseWebServiceConfiguration):
         access_token = get_interaction_extras().access_token
         if access_token is None:
             return
-        if access_token.target != context:
-            raise Unauthorized(
-                "Current authentication does not allow access to this object.")
+
+        # The access token must be for a target that either exactly matches
+        # or contains the context object.
+        if access_token.target == context:
+            pass
+        else:
+            container = nearest_adapter(context, ILaunchpadContainer)
+            if not container.isWithin(
+                    canonical_url(access_token.target, force_local_path=True)):
+                raise Unauthorized(
+                    "Current authentication does not allow access to this "
+                    "object.")
+
         if not required_scopes:
             raise Unauthorized(
                 "Current authentication only allows calling scoped methods.")
diff --git a/lib/lp/soyuz/scripts/initialize_distroseries.py b/lib/lp/soyuz/scripts/initialize_distroseries.py
index 1ca534d..5a773bf 100644
--- a/lib/lp/soyuz/scripts/initialize_distroseries.py
+++ b/lib/lp/soyuz/scripts/initialize_distroseries.py
@@ -1,4 +1,4 @@
-# Copyright 2009-2020 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Initialize a distroseries from its parent distroseries."""
@@ -383,6 +383,9 @@ class InitializeDistroSeries:
         self.distroseries.backports_not_automatic = any(
             parent.backports_not_automatic
                 for parent in self.derivation_parents)
+        self.distroseries.proposed_not_automatic = any(
+            parent.proposed_not_automatic
+                for parent in self.derivation_parents)
         self.distroseries.include_long_descriptions = any(
             parent.include_long_descriptions
                 for parent in self.derivation_parents)
diff --git a/lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py b/lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py
index 4079947..b3edb46 100644
--- a/lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py
+++ b/lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2020 Canonical Ltd.  This software is licensed under the
+# Copyright 2010-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Test the initialize_distroseries script machinery."""
@@ -93,6 +93,7 @@ class InitializationHelperTestCase(TestCaseWithFactory):
         if existing_format_selection is None:
             spfss_utility.add(parent, format_selection)
         parent.backports_not_automatic = True
+        parent.proposed_not_automatic = True
         parent.include_long_descriptions = False
         parent.index_compressors = [IndexCompressionType.XZ]
         parent.publish_by_hash = True
@@ -685,6 +686,7 @@ class TestInitializeDistroSeries(InitializationHelperTestCase):
             SourcePackageFormat.FORMAT_1_0))
         # Other configuration bits are copied too.
         self.assertTrue(child.backports_not_automatic)
+        self.assertTrue(child.proposed_not_automatic)
         self.assertFalse(child.include_long_descriptions)
         self.assertEqual([IndexCompressionType.XZ], child.index_compressors)
         self.assertTrue(child.publish_by_hash)
diff --git a/lib/lp/testing/factory.py b/lib/lp/testing/factory.py
index 9d59ba8..db48ed3 100644
--- a/lib/lp/testing/factory.py
+++ b/lib/lp/testing/factory.py
@@ -131,7 +131,10 @@ from lp.code.interfaces.gitref import (
     IGitRef,
     IGitRefRemoteSet,
     )
-from lp.code.interfaces.gitrepository import IGitRepository
+from lp.code.interfaces.gitrepository import (
+    IGitRepository,
+    IRevisionStatusArtifactSet,
+    )
 from lp.code.interfaces.linkedbranch import ICanHasLinkedBranch
 from lp.code.interfaces.revision import IRevisionSet
 from lp.code.interfaces.sourcepackagerecipe import (
@@ -146,6 +149,7 @@ from lp.code.model.diff import (
     Diff,
     PreviewDiff,
     )
+from lp.code.model.gitrepository import IRevisionStatusReportSet
 from lp.oci.interfaces.ocipushrule import IOCIPushRuleSet
 from lp.oci.interfaces.ocirecipe import IOCIRecipeSet
 from lp.oci.interfaces.ocirecipebuild import IOCIRecipeBuildSet
@@ -1843,6 +1847,30 @@ class BareLaunchpadObjectFactory(ObjectFactory):
                 grantee, grantor, can_create=can_create, can_push=can_push,
                 can_force_push=can_force_push)
 
+    def makeRevisionStatusReport(self, user=None, title=None,
+                                 git_repository=None, commit_sha1=None,
+                                 result_summary=None, url=None, result=None):
+        """Create a new RevisionStatusReport."""
+        if title is None:
+            title = self.getUniqueUnicode()
+        if git_repository is None:
+            git_repository = self.makeGitRepository()
+        if user is None:
+            user = git_repository.owner
+        if commit_sha1 is None:
+            commit_sha1 = hashlib.sha1(self.getUniqueBytes()).hexdigest()
+        return getUtility(IRevisionStatusReportSet).new(
+            user, title, git_repository, commit_sha1, result_summary,
+            url, result)
+
+    def makeRevisionStatusArtifact(self, lfa=None, report=None):
+        """Create a new RevisionStatusArtifact."""
+        if lfa is None:
+            lfa = self.makeLibraryFileAlias()
+        if report is None:
+            report = self.makeRevisionStatusReport()
+        return getUtility(IRevisionStatusArtifactSet).new(lfa, report)
+
     def makeBug(self, target=None, owner=None, bug_watch_url=None,
                 information_type=None, date_closed=None, title=None,
                 date_created=None, description=None, comment=None,
diff --git a/lib/lp/testing/swift/fakeswift.py b/lib/lp/testing/swift/fakeswift.py
index e3dd5e7..f0134d8 100644
--- a/lib/lp/testing/swift/fakeswift.py
+++ b/lib/lp/testing/swift/fakeswift.py
@@ -135,6 +135,8 @@ class FakeKeystone(resource.Resource):
         if tenant_name not in self.root.tenants:
             request.setResponseCode(http.FORBIDDEN)
             return b""
+        if username == "timeout":
+            time.sleep(60)
         if username not in self.users:
             request.setResponseCode(http.FORBIDDEN)
             return b""
diff --git a/lib/lp/translations/scripts/po_import.py b/lib/lp/translations/scripts/po_import.py
index 0cb9200..8b7d9b7 100644
--- a/lib/lp/translations/scripts/po_import.py
+++ b/lib/lp/translations/scripts/po_import.py
@@ -140,11 +140,8 @@ class TranslationsImport(LaunchpadCronScript):
             katie = getUtility(ILaunchpadCelebrities).katie
             if entry.importer == katie:
                 # Email import state to Debian imports email.
-                to_email = None
-            else:
-                to_email = get_contact_email_addresses(entry.importer)
-
-            if to_email:
+                return
+            for to_email in get_contact_email_addresses(entry.importer):
                 text = MailWrapper().format(mail_body)
                 simple_sendmail(from_email, to_email, mail_subject, text)
 
diff --git a/lib/lp/translations/scripts/tests/test_translations_import.py b/lib/lp/translations/scripts/tests/test_translations_import.py
index 07d8776..ffc61fd 100644
--- a/lib/lp/translations/scripts/tests/test_translations_import.py
+++ b/lib/lp/translations/scripts/tests/test_translations_import.py
@@ -188,6 +188,25 @@ class TestTranslationsImport(TestCaseWithFactory):
         self.assertEqual(
             [self.owner.preferredemail.email], self._getEmailRecipients())
 
+    def test_notifies_uploader_separately(self):
+        """Do not put several addresses into one `to`-field"""
+        p1 = self.factory.makePerson()
+        p2 = self.factory.makePerson()
+        uploader = self.factory.makeTeam(
+            members=[p1, p2],
+        )
+        entry = self._makeApprovedEntry(uploader=uploader)
+        transaction.commit()
+        self.script._importEntry(entry)
+        transaction.commit()
+
+        # three emails get generated
+        # and each has only one recipient
+        self.assertEqual(3, len(stub.test_emails))
+        for email in stub.test_emails:
+            number_of_to_addresses = len(email[1])
+            self.assertEqual(1, number_of_to_addresses)
+
     def test_does_not_notify_vcs_imports(self):
         vcs_imports = getUtility(ILaunchpadCelebrities).vcs_imports
         entry = self._makeApprovedEntry(vcs_imports)