launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/turnip:fix-charm-build-path into turnip:master.

Commit message:
charm: Adjust for changes in charm output path

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/turnip/+git/turnip/+merge/398689

The charm build toolchain seems to have dropped the "builds" segment from its output path.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/turnip:fix-charm-build-path into turnip:master.

diff --git a/charm/Makefile b/charm/Makefile
index 147eeb2..860567f 100644
--- a/charm/Makefile
+++ b/charm/Makefile
@@ -61,7 +61,7 @@ dist/.built-%: $(CHARM_DEPS) | $(BUILDDIR)
 
 clean-%:
 	@echo "Cleaning $*..."
-	@rm -rf dist/.built-$* dist/builds/$* $(PUBLISHDIR)/$*
+	@rm -rf dist/.built-$* dist/$* $(PUBLISHDIR)/$*
 
 tmp/git.launchpad.test.crt: | $(TMPDIR)
 	openssl req -new -nodes -keyout tmp/git.launchpad.test.key \
@@ -102,7 +102,7 @@ clean:
 lint: build
 	@echo "Linting charms..."
 	@set -e; for charm in $(CHARMS); do \
-		charm proof dist/builds/$$charm; \
+		charm proof dist/$$charm; \
 	done
 	@echo "Linting python sources..."
 	@flake8 layer $(CHARMS)
@@ -116,7 +116,7 @@ publish: build lint | $(PUBLISHDIR)
 				$(PUBLISHDIR)/$$charm; \
 		fi; \
 		rsync -a -m --ignore-times --exclude .git --delete \
-			dist/builds/$$charm/ $(PUBLISHDIR)/$$charm/; \
+			dist/$$charm/ $(PUBLISHDIR)/$$charm/; \
 		git -C $(PUBLISHDIR)/$$charm add .; \
 		if [ "$$(git -C $(PUBLISHDIR)/$$charm status --porcelain || \
 			 echo status failed)" ]; then \
diff --git a/charm/bundle.yaml.in b/charm/bundle.yaml.in
index f098894..55c04e6 100644
--- a/charm/bundle.yaml.in
+++ b/charm/bundle.yaml.in
@@ -29,14 +29,14 @@ applications:
     charm: cs:rabbitmq-server
     num_units: 1
   turnip-pack-backend:
-    charm: ./dist/builds/turnip-pack-backend
+    charm: ./dist/turnip-pack-backend
     num_units: 1
     options:
       build_label: "%BUILD_LABEL%"
     resources:
       turnip: "../build/%BUILD_LABEL%/turnip.tar.gz"
   turnip-pack-virt:
-    charm: ./dist/builds/turnip-pack-virt
+    charm: ./dist/turnip-pack-virt
     num_units: 1
     to: [turnip-pack-backend]
     options:
@@ -44,7 +44,7 @@ applications:
     resources:
       turnip: "../build/%BUILD_LABEL%/turnip.tar.gz"
   turnip-pack-frontend-git:
-    charm: ./dist/builds/turnip-pack-frontend-git
+    charm: ./dist/turnip-pack-frontend-git
     num_units: 1
     to: [turnip-pack-backend]
     options:
@@ -52,7 +52,7 @@ applications:
     resources:
       turnip: "../build/%BUILD_LABEL%/turnip.tar.gz"
   turnip-pack-frontend-ssh:
-    charm: ./dist/builds/turnip-pack-frontend-ssh
+    charm: ./dist/turnip-pack-frontend-ssh
     num_units: 1
     to: [turnip-pack-backend]
     options:
@@ -62,7 +62,7 @@ applications:
     resources:
       turnip: "../build/%BUILD_LABEL%/turnip.tar.gz"
   turnip-pack-frontend-http:
-    charm: ./dist/builds/turnip-pack-frontend-http
+    charm: ./dist/turnip-pack-frontend-http
     num_units: 1
     to: [turnip-pack-backend]
     options:
@@ -70,7 +70,7 @@ applications:
     resources:
       turnip: "../build/%BUILD_LABEL%/turnip.tar.gz"
   turnip-api:
-    charm: ./dist/builds/turnip-api
+    charm: ./dist/turnip-api
     num_units: 1
     to: [turnip-pack-backend]
     options:
@@ -78,7 +78,7 @@ applications:
     resources:
       turnip: "../build/%BUILD_LABEL%/turnip.tar.gz"
   turnip-celery:
-    charm: ./dist/builds/turnip-celery
+    charm: ./dist/turnip-celery
     num_units: 1
     to: [turnip-pack-backend]
     options: