Merge lp:~mthaddon/mojo/jenkins-deb-upgrade into lp:mojo/mojo-specs

[Tom Haddon]

charm-testing/jenkins: ensure we collect the jenkins deb as part of our upgraded charm

charm-testing/jenkins: ensure we collect the jenkins deb as part of our upgraded charm

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 143

=== added file 'charm-testing/jenkins/create-upgrade-collect'
--- charm-testing/jenkins/create-upgrade-collect	1970-01-01 00:00:00 +0000
+++ charm-testing/jenkins/create-upgrade-collect	2019-10-07 16:48:25 +0000
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Our expected MOJO_STAGE would be something like 'charm-testing/postgresql' so
+# this would be set to 'postgresql'
+CHARM=${MOJO_STAGE##*/}
+# If we have a charm directory already, let's remove it in case the new
+# version is a different type (bzr, git, charmstore, etc.)
+cd ${MOJO_BUILD_DIR}
+[ -d ${CHARM} ] && rm -rf ${CHARM}
+# Now create a collect file we can use in the next phase to download the new
+# charm we want to test
+cd ${MOJO_SPEC_DIR}/${MOJO_STAGE}
+echo "${CHARM} ${UPGRADE_CHARM}" > collect-upgrade
+
+# And also create the jenkins .deb which is bundled with this charm
+echo "jenkins/files @" >> collect-upgrade
+echo "jenkins/files/jenkins.deb http://archive.admin.canonical.com/other/jenkins-stable/jenkins2_latest_all.deb;overwrite=True" >> collect-upgrade