Merge lp:~ericsnowcurrently/landscape-bundles/new-charm-command into lp:landscape-bundles

[Eric Snow]

Update the scripts to the latest charm command.

I've also cleaned a few things up.

Update the scripts to the latest charm command.

I've also cleaned a few things up.

Testing instructions:

charm login # use your charm store user
make diff-charm-store
make upload CHARM_STORE_USER=<your username>
make diff-charm-store CHARM_STORE_USER=<your username> CHANNEL=edge # will fail
make release CHARM_STORE_USER=<your username> CHANNEL=edge
make diff-charm-store CHARM_STORE_USER=<your username> CHANNEL=edge
make release CHARM_STORE_USER=<your username> CHANNEL=beta
make release CHARM_STORE_USER=<your username>
make diff-charm-store CHARM_STORE_USER=<your username>
charm list
charm show <bundle URL>
# You can deploy the bundle at this point.

charm login # log in as "landscape"
make upload CHANNEL=edge
# You can deploy the bundle at this point.
charm show --channel edge <bundle URL>

[Alberto Donato (ack)]

nice, +1

small nits inline

review: Approve

[lp:~ericsnowcurrently/landscape-bundles/new-charm-command]

40. By Eric Snow on 2017-01-20

Small make file cleanups.

[Данило Шеган (danilo)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2016-07-22 14:57:28 +0000
+++ Makefile	2017-01-20 20:06:39 +0000
@@ -1,29 +1,32 @@
-diff-charm-store: check-env render
-	./charm-store diff $${CHARM_STORE_USER}
-
-push-charm-store: check-env render
-	./charm-store push $${CHARM_STORE_USER}
-
-publish-charm-store: check-env render
-	./charm-store publish-latest $${CHARM_STORE_USER}
-
-check-env:
-ifndef CHARM_STORE_USER
-	$(error CHARM_STORE_USER is undefined, hint: launchpad id.)
-endif
-
-clean:
-	@rm -rf build
-
+
+CHARM_STORE_USER ?= "landscape"
+
+.PHONY: diff-charm-store
+diff-charm-store: render
+	./charm-store diff ${CHARM_STORE_USER} ${CHANNEL}
+
+.PHONY: upload
+upload: render
+	./charm-store push ${CHARM_STORE_USER} ${CHANNEL}
+
+.PHONY: release-latest
+release-latest:
+	./charm-store publish-latest ${CHARM_STORE_USER} ${CHANNEL}
+
+.PHONY: render
 render: deps clean
 	@./render-bundles
-	
+
+.PHONY: update-charm-revisions
 update-charm-revisions: deps
 	@./update-charm-revisions \
 		$(EXTRA_UPDATE_ARGUMENTS) \
 		postgresql haproxy rabbitmq-server
 
+.PHONY: deps
 deps:
 	@./ubuntu-deps
 
-.PHONY: clean render commit-charm-store update-charm-revisions compare-charm-store deps
+.PHONY: clean
+clean:
+	@rm -rf build

=== modified file 'charm-store'
--- charm-store	2016-07-22 13:49:55 +0000
+++ charm-store	2017-01-20 20:06:39 +0000
@@ -6,6 +6,9 @@
 
 ACTION=$1
 STORE_USER=${2:-landscape}
+CHANNEL=${3}
+INITIAL_CHANNEL="edge"
+RELEASE_CHANNEL="stable"
 
 if [ -z "$ACTION" ]; then
     cat <<EOF
@@ -28,25 +31,37 @@
 for target in landscape-dense-maas landscape-dense landscape-scalable; do
 
     if [ "$ACTION" == "diff" ]; then
-        echo "# [$target] Pulling fresh copy from stable channel"
-        charm pull --channel stable "cs:~${STORE_USER}/bundle/${target}" build/${target}-stable
+        if [ -z $CHANNEL ]; then
+            CHANNEL=$RELEASE_CHANNEL
+        fi
+        echo "# [$target] Pulling fresh copy from $CHANNEL channel"
+        (set -x; charm pull --channel $CHANNEL "cs:~${STORE_USER}/bundle/${target}" build/${target}-${CHANNEL})
 
-        echo "# [$target] Diff from latest stable"
-        diff -Naur --exclude bundles.yaml build/${target}-stable build/${target} || /bin/true
+        echo "# [$target] Diff from latest $CHANNEL"
+        (set +e; set -x; diff -Naur --exclude bundles.yaml build/${target}-${CHANNEL} build/${target}); RC=$?
+        if [ $RC -eq 0 ]; then
+            echo "<local bundle matches $CHANNEL channel>"
+        fi
     fi
 
     if [ "$ACTION" == "push" ]; then
         echo "# [$target] Pushing to namespace ~${STORE_USER}, unpublished channel"
-        url=$(charm push build/${target} cs:~${STORE_USER}/bundle/${target} | grep ^url | awk '{ print $2 }')
+        url=$( (set -x; charm push build/${target} cs:~${STORE_USER}/bundle/${target}) | grep ^url | awk '{ print $2 }')
 
-        echo "# [$target] Publishing to development channel"
-        charm publish --channel development $url
+        if [ -n $CHANNEL ]; then
+            echo "# [$target] Publishing to ${CHANNEL} channel"
+            (set -x; charm release --channel ${CHANNEL} $url)
+        fi
     fi
 
     if [ "$ACTION" == "publish-latest" ]; then
         latest=$(charm show --channel unpublished --format=json cs:~${STORE_USER}/bundle/${target} | jq -r '.["revision-info"].Revisions[0]')
-        echo "# [$target] Publishing latest unpublished revision, stable channel"
-        charm publish $latest
+
+        if [ -z $CHANNEL ]; then
+            CHANNEL=$RELEASE_CHANNEL
+        fi
+        echo "# [$target] Publishing latest unpublished revision to ${CHANNEL} channel"
+        (set -x; charm release --channel ${CHANNEL} $latest)
     fi
 
 done
@@ -58,7 +73,8 @@
 #   ll build/*-stable"
 #
 # Show details in the store:
-#   charm show [--channel unpublished] cs:~${STORE_USER}/bundle/landscape-dense-maas
+#   charm show cs:~${STORE_USER}/bundle/landscape-dense-maas
+#   charm show --channel unpublished cs:~${STORE_USER}/bundle/landscape-dense-maas
 #
 # Make sure everyone can use your charm if you want:
 #   charm grant cs:~${STORE_USER}/bundle/BUNDLE_NAME-VERSION everyone