Merge ~xavpaice/charm-glance-sync:add_charmcraft into charm-glance-sync:master

[Xav Paice]

add charmcraft.yaml

[🤖 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)]

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:0ffaf1a88656e3b041b6788a604a0091aab8476b
https://jenkins.canonical.com/bootstack/job/lp-charm-glance-sync-ci/2/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit/284/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1207/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-glance-sync-ci/2//rebuild

review: Approve (continuous-integration)

[Przemyslaw Lal (przemeklal)]

LGTM

review: Approve

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

Change successfully merged at revision b6440a4692cf8a3feed489a17d869443fe414389

diff --git a/Makefile b/Makefile
index 53f7685..c5f192e 100644
--- a/Makefile
+++ b/Makefile
@@ -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}')
 
@@ -35,20 +38,26 @@ clean:
 	@git clean -ffXd -e '!.idea'
 	@echo "Cleaning existing build"
 	@rm -rf ${CHARM_BUILD_DIR}/${CHARM_NAME}
+	@rm -rf ${PROJECTPATH}/${CHARM_NAME}.charm
+	@charmcraft clean
 
 submodules:
+	# @echo "Cloning submodules"
 	# @git submodule update --init --recursive
 	@echo "No submodules. Skipping."
 
 submodules-update:
+	# @echo "Pulling latest updates for submodules"
 	# @git submodule update --init --recursive --remote --merge
 	@echo "No submodules. Skipping."
 
-build:
+build: clean
 	@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}"
@@ -66,12 +75,12 @@ proof: build
 	@charm proof ${CHARM_BUILD_DIR}/${CHARM_NAME}
 
 unittests:
-	#@-cd src && tox -e unit
-	@echo "No unit tests. Skipping."
+	@echo "No unit tests"
+	# @cd src && tox -e unit
 
 functional: build
 	@echo "Executing functional tests in ${CHARM_BUILD_DIR}"
-	@cd src && CHARM_BUILD_DIR=${CHARM_BUILD_DIR} tox -e func
+	@cd src && CHARM_BUILD_DIR=${CHARM_BUILD_DIR} 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..7d9c002
--- /dev/null
+++ b/charmcraft.yaml
@@ -0,0 +1,20 @@
+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
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/unit/requirements.txt b/src/tests/unit/requirements.txt
index be9b2a5..2936edb 100644
--- a/src/tests/unit/requirements.txt
+++ b/src/tests/unit/requirements.txt
@@ -5,4 +5,3 @@ flake8
 charms.reactive
 pytest
 pytest-cov
--e git+https://git.launchpad.net/~jjo/layer-snap@cab2b604695f39a81abe47b22b8426e44e66df8f#egg=charms.layer
diff --git a/src/tox.ini b/src/tox.ini
index e7d8263..7aa45dc 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -10,7 +10,8 @@ setenv =
 passenv =
   HOME
   PATH
-  CHARM_BUILD_DIR
+  CHARM_*
+  OS_*
   PYTEST_KEEP_MODEL
   PYTEST_CLOUD_NAME
   PYTEST_CLOUD_REGION