Mojo: Continuous Delivery for Juju

Merge lp:~mthaddon/mojo/livepatch-focal-spec into lp:mojo/mojo-specs

  1. livepatch-focal-spec
  2. Merge into mojo-specs
Proposed by Tom Haddon
Status: Merged
Approved by: Haw Loeung
Approved revision: 156
Merged at revision: 154
Proposed branch: lp:~mthaddon/mojo/livepatch-focal-spec
Merge into: lp:mojo/mojo-specs
Diff against target: 23 lines (+5/-5)
2 files modified
charm-testing/livepatch/collect (+3/-3)
charm-testing/livepatch/pre-deploy (+2/-2)
To merge this branch: bzr merge lp:~mthaddon/mojo/livepatch-focal-spec
Reviewer Review Type Date Requested Status
Haw Loeung +1 Approve
Review via email: mp+379514@code.launchpad.net

Commit message

charm-testing/livepatch: remove series specific collects, update copying of secrets

Description of the change

charm-testing/livepatch: remove series specific collects, update copying of secrets

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

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

Revision history for this message
Haw Loeung (hloeung) wrote :

LGTM

review: Approve (+1)
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 154

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charm-testing/livepatch/collect'
2--- charm-testing/livepatch/collect 2017-05-19 07:44:24 +0000
3+++ charm-testing/livepatch/collect 2020-02-19 23:39:06 +0000
4@@ -1,3 +1,3 @@
5-ubuntu cs:{{ series }}/ubuntu
6-canonical-livepatch cs:{{ series }}/canonical-livepatch
7-nrpe cs:{{ series }}/nrpe
8+ubuntu cs:ubuntu
9+canonical-livepatch cs:canonical-livepatch
10+nrpe cs:nrpe
11
12=== modified file 'charm-testing/livepatch/pre-deploy'
13--- charm-testing/livepatch/pre-deploy 2017-05-19 06:16:16 +0000
14+++ charm-testing/livepatch/pre-deploy 2020-02-19 23:39:06 +0000
15@@ -2,6 +2,6 @@
16
17 # If we don't have a secrets file, just copy the deploy file to deploy-secrets
18 if [ ! -f ${MOJO_LOCAL_DIR}/deploy-secrets ]; then
19- echo "Copying ${MOJO_REPO_DIR}/charm-testing/livepatch/deploy to ${MOJO_LOCAL_DIR}/deploy-secrets"
20- cp ${MOJO_REPO_DIR}/charm-testing/livepatch/deploy ${MOJO_LOCAL_DIR}/deploy-secrets
21+ echo "Copying ${MOJO_SPEC_DIR}/charm-testing/livepatch/deploy to ${MOJO_LOCAL_DIR}/deploy-secrets"
22+ cp ${MOJO_SPEC_DIR}/charm-testing/livepatch/deploy ${MOJO_LOCAL_DIR}/deploy-secrets
23 fi

Subscribers

People subscribed via source and target branches

to all changes: