Merge ~arturo-seijas/charm-k8s-mattermost:add-charmcraft-file into charm-k8s-mattermost:master

[Arturo Enrique Seijas Fernández]

Add charmcraft.yaml file

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

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

[Tom Haddon (mthaddon)]

Two very minor comments

[Arturo Enrique Seijas Fernández (arturo-seijas)]

> Two very minor comments

Agreed. Fixed

[Tom Haddon (mthaddon)]

LGTM, thx

review: Approve

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

Change successfully merged at revision e6babfbe8eed1db1bec062d47fcf802e69eb0801

diff --git a/Makefile b/Makefile
index 1bf76cc..8eaa38b 100644
--- a/Makefile
+++ b/Makefile
@@ -6,9 +6,7 @@ lint: blacken
 	@echo "Running flake8"
 	@tox -e lint
 
-# We actually use the build directory created by charmcraft,
-# but the .charm file makes a much more convenient sentinel.
-unittest: mattermost-k8s.charm
+unittest: blacken lint
 	@tox -e unit
 
 test: lint unittest
@@ -17,7 +15,4 @@ clean:
 	@echo "Cleaning files"
 	@git clean -fXd
 
-mattermost-k8s.charm: src/*.py requirements.txt
-	charmcraft build
-
 .PHONY: lint test unittest clean
diff --git a/charmcraft.yaml b/charmcraft.yaml
new file mode 100644
index 0000000..07b8d79
--- /dev/null
+++ b/charmcraft.yaml
@@ -0,0 +1,8 @@
+type: "charm"
+bases:
+  - build-on:
+    - name: "ubuntu"
+      channel: "20.04"
+    run-on:
+    - name: "ubuntu"
+      channel: "20.04"
diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py
new file mode 100644
index 0000000..c5e3156
--- /dev/null
+++ b/tests/unit/__init__.py
@@ -0,0 +1,3 @@
+import ops.testing
+
+ops.testing.SIMULATE_CAN_CONNECT = True
diff --git a/tox.ini b/tox.ini
index 066c5a8..366d803 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,7 +18,7 @@ setenv =
   PYTHONPATH={toxinidir}/src:{toxinidir}/build/lib:{toxinidir}/build/venv
   TZ=UTC
 
-[testenv:functional]
+[testenv:integration]
 passenv =
   HOME
   JUJU_REPOSITORY