Add Juju 3.4 support (#12)

* Add Juju 3.4 support

Add symble bundle for func test to verify, that charm can be
deployed. Sanitazied the Makefile and add Juju 3.4 to CI.

* Use concurrency for GH workflow

.github/workflows/check.yaml

@@ -10,6 +10,10 @@ on:
       - "**.md"
       - "**.rst"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   lint-unit:
     uses: canonical/bootstack-actions/.github/workflows/lint-unit.yaml@v2
@@ -19,15 +23,17 @@ jobs:
         python-version: ["3.8", "3.10"]
     with:
       python-version: ${{ matrix.python-version }}
-      tox-version: "<4"
 
   func:
     uses: canonical/bootstack-actions/.github/workflows/func.yaml@v2
-    needs: lint-unit
+    strategy:
+      fail-fast: false
+      matrix:
+        command: ["TEST_JUJU3=1 make functional"]  # TEST_JUJU3 needed due https://github.com/openstack-charmers/zaza/blob/b22c2eed4c322f1dfc14ffb2d31e0dd18c911a40/setup.py#L47 to support Juju3+
+        juju-channel: ["3.4/stable"]
     with:
-      command: tox -e func
-      juju-channel: "3.1/stable"
-      nested-containers: true
+      command: ${{ matrix.command }}
+      juju-channel: ${{ matrix.juju-channel }}
+      nested-containers: false
       python-version: "3.10"
       timeout-minutes: 120
-      tox-version: "<4"

Makefile

@@ -43,8 +43,6 @@ submodules-update:
 	@git submodule update --init --recursive --remote --merge
 
 clean:
-	@echo "Cleaning files"
-	@git clean -ffXd -e '!.idea' -e '!.vscode'
 	@echo "Cleaning existing build"
 	@rm -rf ${PROJECTPATH}/${CHARM_NAME}*.charm
 	@echo "Cleaning charmcraft"
@@ -80,4 +78,4 @@ test: lint unittests functional
 	@echo "Tests completed for charm ${CHARM_NAME}."
 
 # The targets below don't depend on a file
-.PHONY: help dev-environment pre-commit submodules submodules-update clean build lint reformat unittests functional
+.PHONY: help dev-environment pre-commit submodules submodules-update clean build lint reformat unittests functional

tests/functional/tests/__init__.py

@@ -0,0 +1 @@
+"""Zaza tests."""

tests/functional/tests/bundles/base.yaml

@@ -0,0 +1,5 @@
+applications:
+  nginx:
+    charm: nginx
+    num_units: 1
+

tests/functional/tests/bundles/focal.yaml

@@ -0,0 +1 @@
+base.yaml

tests/functional/tests/bundles/jammy.yaml

@@ -0,0 +1 @@
+base.yaml

tests/functional/tests/bundles/overlays/focal.yaml.j2

@@ -0,0 +1 @@
+series: focal

tests/functional/tests/bundles/overlays/jammy.yaml.j2

@@ -0,0 +1 @@
+series: jammy

tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2

@@ -0,0 +1,3 @@
+applications:
+  {{ charm_name }}:
+    charm: "{{ CHARM_LOCATION }}/{{ charm_name }}.charm"

tests/functional/tests/tests.yaml

@@ -0,0 +1,12 @@
+charm_name: nginx
+gate_bundles:
+  - focal
+  - jammy
+smoke_bundles:
+  - focal
+dev_bundles:
+  - focal
+target_deploy_status:
+  nginx:
+    workload-status: unknown
+    workload-status-message-prefix: ""

tox.ini

@@ -76,8 +76,7 @@ deps =
 
 [testenv:func]
 changedir = {toxinidir}/tests/functional
-commands = echo "Functional tests are under development"
-whitelist_externals = echo
+commands = functest-run-suite {posargs:--keep-faulty-model}
 deps =
-  git+https://github.com/openstack-charmers/zaza.git#egg=zaza
-  -r {toxinidir}/tests/functional/requirements.txt
+  git+https://github.com/openstack-charmers/zaza.git@master#egg=zaza
+  -r {toxinidir}/tests/functional/requirements.txt