Landscape Bundles

Merge lp:~simpoir/landscape-bundles/bash_quotes into lp:landscape-bundles

  1. bash_quotes
  2. Merge into trunk
Proposed by Simon Poirier
Status: Merged
Approved by: Simon Poirier
Approved revision: 56
Merged at revision: 56
Proposed branch: lp:~simpoir/landscape-bundles/bash_quotes
Merge into: lp:landscape-bundles
Diff against target: 66 lines (+10/-10)
2 files modified
charm-store (+9/-9)
render-bundles (+1/-1)
To merge this branch: bzr merge lp:~simpoir/landscape-bundles/bash_quotes
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+406210@code.launchpad.net

Commit message

Updated charm rev and fixed charm publish script.

Description of the change

New landscape charm rev.

* updated landscape-server charm rev
* missing quotes in bash scripts made it try to publish to null channel.

To post a comment you must log in.
Revision history for this message
Simon Poirier (simpoir) :
Revision history for this message
Daniel Manrique (roadmr) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charm-store'
2--- charm-store 2020-09-30 15:00:24 +0000
3+++ charm-store 2021-07-26 21:14:08 +0000
4@@ -4,9 +4,9 @@
5 # Needs make clean, make render called first.
6 #
7
8-ACTION=$1
9-STORE_USER=${2:-landscape}
10-CHANNEL=${3}
11+ACTION="$1"
12+STORE_USER="${2:-landscape}"
13+CHANNEL="${3}"
14 INITIAL_CHANNEL="edge"
15 RELEASE_CHANNEL="stable"
16
17@@ -31,7 +31,7 @@
18 for target in landscape-dense-maas landscape-dense landscape-scalable; do
19
20 if [ "$ACTION" == "diff" ]; then
21- if [ -z $CHANNEL ]; then
22+ if [ -z "$CHANNEL" ]; then
23 CHANNEL=$RELEASE_CHANNEL
24 fi
25 echo "# [$target] Pulling fresh copy from $CHANNEL channel"
26@@ -46,22 +46,22 @@
27
28 if [ "$ACTION" == "push" ]; then
29 echo "# [$target] Pushing to namespace ~${STORE_USER}, unpublished channel"
30- url=$( (set -x; charm push build/${target} cs:~${STORE_USER}/bundle/${target}) | grep ^url | awk '{ print $2 }')
31+ url=$( (set -x; charm push "build/${target}" "cs:~${STORE_USER}/bundle/${target}") | grep ^url | awk '{ print $2 }')
32
33- if [ -n $CHANNEL ]; then
34+ if [ -n "$CHANNEL" ]; then
35 echo "# [$target] Publishing to ${CHANNEL} channel"
36- (set -x; charm release --channel ${CHANNEL} $url)
37+ (set -x; charm release --channel "${CHANNEL}" "$url")
38 fi
39 fi
40
41 if [ "$ACTION" == "publish-latest" ]; then
42- latest=$(charm show --channel unpublished --all --format=json cs:~${STORE_USER}/bundle/${target} | jq -r '.id.Id')
43+ latest=$(charm show --channel unpublished --all --format=json "cs:~${STORE_USER}/bundle/${target}" | jq -r '.id.Id')
44
45 if [ -z $CHANNEL ]; then
46 CHANNEL=$RELEASE_CHANNEL
47 fi
48 echo "# [$target] Publishing latest unpublished revision to ${CHANNEL} channel"
49- (set -x; charm release --channel ${CHANNEL} $latest)
50+ (set -x; charm release --channel "${CHANNEL}" "$latest")
51 fi
52
53 done
54
55=== modified file 'render-bundles'
56--- render-bundles 2020-09-30 13:33:08 +0000
57+++ render-bundles 2021-07-26 21:14:08 +0000
58@@ -16,7 +16,7 @@
59 "memory": 2048},
60 "haproxy": {},
61 "landscape": {
62- "charm": "cs:bionic/landscape-server-38",
63+ "charm": "cs:bionic/landscape-server-40",
64 "memory": 4096,
65 # We defer to the default "install_sources" from the charm.
66 "install_keys": "4652B4E6"}

Subscribers

People subscribed via source and target branches

to all changes: