Merge ~xavpaice/charm-prometheus-openstack-exporter:add_charmcraft into charm-prometheus-openstack-exporter:master

[Xav Paice]

Add charmcraft.yaml

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

A CI job is currently in progress. A follow up comment will be added when it completes.

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

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

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:1daa1d4ce5c51967739269a45e7cc8281ce27f3a
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus-openstack-exporter-ci/15/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit/275/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1020/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus-openstack-exporter-ci/15//rebuild

review: Approve (continuous-integration)

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

Change successfully merged at revision 4456fe083de197aae19a919e60be5538ba88f4a5

diff --git a/Makefile b/Makefile
index 5416279..76f44ce 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ PYTHON := /usr/bin/python3
 
 PROJECTPATH=$(dir $(realpath $(MAKEFILE_LIST)))
 ifndef CHARM_BUILD_DIR
-	CHARM_BUILD_DIR=${PROJECTPATH}.build
+	CHARM_BUILD_DIR=${PROJECTPATH}/build
 endif
 ifndef CHARM_LAYERS_DIR
 	CHARM_LAYERS_DIR=${PROJECTPATH}/layers
@@ -10,6 +10,9 @@ endif
 ifndef CHARM_INTERFACES_DIR
 	CHARM_INTERFACES_DIR=${PROJECTPATH}/interfaces
 endif
+ifdef CONTAINER
+	BUILD_ARGS="--destructive-mode"
+endif
 METADATA_FILE="src/metadata.yaml"
 CHARM_NAME=$(shell cat ${PROJECTPATH}/${METADATA_FILE} | grep -E "^name:" | awk '{print $$2}')
 
@@ -34,7 +37,9 @@ clean:
 	@echo "Cleaning files"
 	@git clean -ffXd -e '!.idea'
 	@echo "Cleaning existing build"
-	@rm -rf ${CHARM_BUILD_DIR}/${CHARM_NAME}
+	@rm -rf ${PROJECTPATH}/${CHARM_NAME}.charm
+	@rm -rf ${CHARM_BUILD_DIR}/*
+	@charmcraft clean
 
 submodules:
 	@echo "Cloning submodules"
@@ -47,11 +52,14 @@ submodules-update:
 build:
 	@echo "Building charm to directory ${CHARM_BUILD_DIR}/${CHARM_NAME}"
 	@-git rev-parse --abbrev-ref HEAD > ./src/repo-info
-	@CHARM_LAYERS_DIR=${CHARM_LAYERS_DIR} CHARM_INTERFACES_DIR=${CHARM_INTERFACES_DIR} \
-		TERM=linux CHARM_BUILD_DIR=${CHARM_BUILD_DIR} charm build src/
+	@charmcraft -v pack ${BUILD_ARGS}
+	@bash -c ./rename.sh
+	@mkdir -p ${CHARM_BUILD_DIR}/${CHARM_NAME}
+	@unzip ${PROJECTPATH}/${CHARM_NAME}.charm -d ${CHARM_BUILD_DIR}/${CHARM_NAME}
 
 release: clean build
-	@echo "Charm is built at ${CHARM_BUILD_DIR}/${CHARM_NAME}"
+	@echo "Charm is built at ${PROJECTPATH}/${CHARM_NAME}.charm"
+	@charmcraft upload ${PROJECTPATH}/${CHARM_NAME}.charm --release edge
 
 lint:
 	@echo "Running lint checks"
diff --git a/charmcraft.yaml b/charmcraft.yaml
new file mode 100644
index 0000000..1f750bc
--- /dev/null
+++ b/charmcraft.yaml
@@ -0,0 +1,25 @@
+type: charm
+parts:
+  charm:
+    source: src
+    plugin: reactive
+    build-snaps: [charm]
+bases:
+    - build-on:
+        - name: ubuntu
+          channel: "20.04"
+          architectures: ["amd64"]
+      run-on:
+        - name: ubuntu
+          channel: "20.04"
+          architectures:
+              - amd64
+        - name: ubuntu
+          channel: "18.04"
+          architectures:
+              - amd64
+        - name: ubuntu
+          channel: "16.04"
+          architectures:
+              - amd64
+
diff --git a/metadata.yaml b/metadata.yaml
new file mode 120000
index 0000000..0768683
--- /dev/null
+++ b/metadata.yaml
@@ -0,0 +1 @@
+src/metadata.yaml
\ No newline at end of file
diff --git a/rename.sh b/rename.sh
new file mode 100755
index 0000000..bc8697f
--- /dev/null
+++ b/rename.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+charm=$(grep -E "^name:" src/metadata.yaml | awk '{print $2}')
+echo "renaming ${charm}_*.charm to ${charm}.charm"
+echo -n "pwd: "
+pwd
+ls -al
+echo "Removing previous charm if it exists"
+if [[ -e "${charm}.charm" ]];
+then
+    rm "${charm}.charm"
+fi
+echo "Renaming charm here."
+mv ${charm}_*.charm ${charm}.charm
diff --git a/src/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2 b/src/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2
index da7d731..319de18 100644
--- a/src/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2
+++ b/src/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2
@@ -1,3 +1,3 @@
 applications:
   prometheus-openstack-exporter:
-    charm: "{{ CHARM_BUILD_DIR }}/{{ charm_name }}"
+    charm: "{{ PROJECTPATH }}/{{ charm_name }}.charm"