Merge ~barryprice/launchpad-mojo-specs/+git/launchpad-mojo-specs:master into launchpad-mojo-specs:master

[Barry Price]

Deploy latest turnip-pack-virt charm to add an alert hint

[Colin Watson (cjwatson)]

I'm a bit confused about why we'd only deploy turnip-pack-virt, given that the actual change being deployed is in the add_nagios_e2e_checks function and that's only called from turnip-pack-frontend-git and turnip-pack-frontend-http.

We should probably just upgrade the full set.

review: Needs Information

[Barry Price (barryprice)]

Good point - pushed a fix.

The turnipcake branch appears not to have been updated, hence no revno change there:

https://git.launchpad.net/~canonical-launchpad-branches/turnip/+git/charm-build-turnipcake

review: Needs Resubmitting

[Colin Watson (cjwatson)]

Sorry, I should have noticed this before, but this approach still isn't quite going to work. Charms that we're upgrading need to go in collect-charm-upgrades instead. collect-charms is a baseline initial deployment for CI.

(Also, no need to cast a Resubmit vote when you've made changes to your own MP. The purpose of Resubmit is for a reviewer to say that they think your MP needs to be resubmitted in some completely different shape.)

review: Needs Fixing

[Barry Price (barryprice)]

> Sorry, I should have noticed this before, but this approach still isn't quite
> going to work. Charms that we're upgrading need to go in collect-charm-
> upgrades instead. collect-charms is a baseline initial deployment for CI.
>
> (Also, no need to cast a Resubmit vote when you've made changes to your own
> MP. The purpose of Resubmit is for a reviewer to say that they think your MP
> needs to be resubmitted in some completely different shape.)

Thanks, pushed again.

[Colin Watson (cjwatson)]

review: Approve

diff --git a/mojo-lp-git/collect-charm-upgrades b/mojo-lp-git/collect-charm-upgrades
index 02288a6..8f04496 100644
--- a/mojo-lp-git/collect-charm-upgrades
+++ b/mojo-lp-git/collect-charm-upgrades
@@ -1,4 +1,9 @@
 # Add any charm upgrades which are part of the current deployment.
 # This file can be empty when there are none.
-turnip-pack-backend		git+https://git.launchpad.net/~canonical-launchpad-branches/turnip/+git/charm-build-turnip-pack-backend;revno=build/8377d7f0b7605fb25860578f0e72857a0b7e56e4
-turnip-celery			git+https://git.launchpad.net/~canonical-launchpad-branches/turnip/+git/charm-build-turnip-celery;revno=build/8377d7f0b7605fb25860578f0e72857a0b7e56e4
+turnip-pack-backend            git+https://git.launchpad.net/~canonical-launchpad-branches/turnip/+git/charm-build-turnip-pack-backend;revno=build/80bf3cdc8ada3e002c0e492f423942b5e3be4fa7
+turnip-pack-virt               git+https://git.launchpad.net/~canonical-launchpad-branches/turnip/+git/charm-build-turnip-pack-virt;revno=build/80bf3cdc8ada3e002c0e492f423942b5e3be4fa7
+turnip-pack-frontend-git       git+https://git.launchpad.net/~canonical-launchpad-branches/turnip/+git/charm-build-turnip-pack-frontend-git;revno=build/80bf3cdc8ada3e002c0e492f423942b5e3be4fa7
+turnip-pack-frontend-ssh       git+https://git.launchpad.net/~canonical-launchpad-branches/turnip/+git/charm-build-turnip-pack-frontend-ssh;revno=build/80bf3cdc8ada3e002c0e492f423942b5e3be4fa7
+turnip-pack-frontend-http      git+https://git.launchpad.net/~canonical-launchpad-branches/turnip/+git/charm-build-turnip-pack-frontend-http;revno=build/80bf3cdc8ada3e002c0e492f423942b5e3be4fa7
+turnip-api                     git+https://git.launchpad.net/~canonical-launchpad-branches/turnip/+git/charm-build-turnip-api;revno=build/80bf3cdc8ada3e002c0e492f423942b5e3be4fa7
+turnip-celery                  git+https://git.launchpad.net/~canonical-launchpad-branches/turnip/+git/charm-build-turnip-celery;revno=build/80bf3cdc8ada3e002c0e492f423942b5e3be4fa7