Merge ~xavpaice/charm-kubernetes-service-checks:add_charmcraft into charm-kubernetes-service-checks:master

[Xav Paice]

add/update 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.

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

PASSED: Continuous integration, rev:33c97e92865b11359da61eb978c1ecd8471fee51
https://jenkins.canonical.com/bootstack/job/lp-charm-kubernetes-service-checks-ci/16/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit/282/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1160/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-kubernetes-service-checks-ci/16//rebuild

review: Approve (continuous-integration)

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

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

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

Change successfully merged at revision c692111c9a061d0fa12a56e56210aea0869b5177

diff --git a/.gitignore b/.gitignore
index 5237a11..43df031 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,4 @@ dist/
 # Builds
 .build/
 build/
+*.charm
diff --git a/Makefile b/Makefile
index cb7ac8b..a99dd3b 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,9 @@ PROJECTPATH=$(dir $(realpath $(MAKEFILE_LIST)))
 ifndef CHARM_BUILD_DIR
 	CHARM_BUILD_DIR=${PROJECTPATH}.build
 endif
+ifdef CONTAINER
+	BUILD_ARGS="--destructive-mode"
+endif
 METADATA_FILE="metadata.yaml"
 CHARM_NAME=$(shell cat ${PROJECTPATH}/${METADATA_FILE} | grep -E '^name:' | awk '{print $$2}')
 
@@ -29,6 +32,8 @@ clean:
 	@git clean -ffXd -e '!.idea'
 	@echo "Cleaning existing build"
 	@rm -rf ${CHARM_BUILD_DIR}/${CHARM_NAME}
+	@charmcraft clean
+	@rm -rf ${PROJECTPATH}/${CHARM_NAME}.charm
 
 submodules:
 	@echo "Cloning submodules"
@@ -38,14 +43,14 @@ submodules-update:
 	@echo "Pulling latest updates for submodules"
 	@git submodule update --init --recursive --remote --merge
 
-build:
+build: clean submodules-update
 	@echo "Building charm to base directory ${CHARM_BUILD_DIR}/${CHARM_NAME}"
 	@-git rev-parse --abbrev-ref HEAD > ./repo-info
 	@-git describe --always > ./version
-	@mkdir -p ${CHARM_BUILD_DIR}
-	@tox -e build
-	@mv ${CHARM_NAME}.charm ${CHARM_BUILD_DIR}
-
+	@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 unpack
 	@echo "Charm is built at ${CHARM_BUILD_DIR}/${CHARM_NAME}"
@@ -79,7 +84,7 @@ unittests:
 
 functional: build
 	@echo "Executing functional tests in ${CHARM_BUILD_DIR}"
-	@CHARM_BUILD_DIR=${CHARM_BUILD_DIR} tox -e func
+	@CHARM_LOCATION=${PROJECTPATH} tox -e func
 
 test: lint proof unittests functional
 	@echo "Tests completed for charm ${CHARM_NAME}."
diff --git a/charmcraft.yaml b/charmcraft.yaml
new file mode 100644
index 0000000..3e89d20
--- /dev/null
+++ b/charmcraft.yaml
@@ -0,0 +1,15 @@
+type: 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
diff --git a/rename.sh b/rename.sh
new file mode 100755
index 0000000..956a76b
--- /dev/null
+++ b/rename.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+charm=$(grep -E "^name:" 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/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2 b/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2
index 7f59ee2..d380e43 100644
--- a/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2
+++ b/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2
@@ -1,3 +1,3 @@
 applications:
   {{ charm_name }}:
-    charm: {{ CHARM_BUILD_DIR }}/{{ charm_name }}.charm
+    charm: {{ CHARM_LOCATION }}/{{ charm_name }}.charm
diff --git a/tox.ini b/tox.ini
index a435b08..4dc1420 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@ setenv =
 passenv =
   HOME
   PATH
-  CHARM_BUILD_DIR
+  CHARM_*
   PYTEST_KEEP_MODEL
   PYTEST_CLOUD_NAME
   PYTEST_CLOUD_REGION
@@ -33,7 +33,6 @@ passenv =
   OS_IDENTITY_API_VERSION
 
 [testenv:build]
-deps = charmcraft<1.1.0
 commands = charmcraft build
 
 [testenv:lint]