Merge ~hloeung/jenkins-agent-charm:master into jenkins-agent-charm:master

[Haw Loeung]

Replace functional testing using pytest with zaza

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

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

[Haw Loeung (hloeung)]

Output from 'make lint unittest functionaltest' run - https://pastebin.ubuntu.com/p/kpkcT87F3Q/

[Stuart Bishop (stub)]

Looks good from my end. Before landing, worth considering your opinion on if this is a step forward or backwards and discussing if you think backwards.

review: Approve

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

Change successfully merged at revision 5b771d15301641c7338157ac517156ad2aefe1b6

diff --git a/Makefile b/Makefile
index e592bf7..43470ed 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ lint:
 	@echo "Running flake8"
 	@tox -e lint
 
-test: unittest functionaltest lint
+test: lint unittest functionaltest
 
 unittest:
 	@tox -e unit
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 8462291..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-# Include python requirements here
diff --git a/tests/bundles b/tests/bundles
new file mode 120000
index 0000000..dbd0feb
--- /dev/null
+++ b/tests/bundles
@@ -0,0 +1 @@
+functional/bundles
\ No newline at end of file
diff --git a/tests/functional/bundles/base-bionic.yaml b/tests/functional/bundles/base-bionic.yaml
new file mode 100644
index 0000000..cb92d23
--- /dev/null
+++ b/tests/functional/bundles/base-bionic.yaml
@@ -0,0 +1,22 @@
+series: bionic
+
+applications:
+  jenkins:
+    charm: cs:jenkins
+    num_units: 1
+    options:
+      username: admin
+      password: admin
+    expose: true
+
+  jenkins-slave:
+    num_units: 1
+
+  nrpe:
+    charm: cs:nrpe
+
+relations:
+  - - jenkins
+    - jenkins-slave
+  - - jenkins-slave
+    - nrpe
diff --git a/tests/functional/bundles/overlays/local-charm-overlay.yaml.j2 b/tests/functional/bundles/overlays/local-charm-overlay.yaml.j2
new file mode 100644
index 0000000..1adcb54
--- /dev/null
+++ b/tests/functional/bundles/overlays/local-charm-overlay.yaml.j2
@@ -0,0 +1,3 @@
+applications:
+  jenkins-slave:
+    charm: /tmp/charm-builds/jenkins-slave
diff --git a/tests/functional/requirements.txt b/tests/functional/requirements.txt
index f76bfbb..b7c9112 100644
--- a/tests/functional/requirements.txt
+++ b/tests/functional/requirements.txt
@@ -1,6 +1 @@
-flake8
-juju
-mock
-pytest
-pytest-asyncio
-requests
+git+https://github.com/openstack-charmers/zaza.git#egg=zaza
diff --git a/tests/functional/test_jenkins_slave.py b/tests/functional/test_jenkins_slave.py
deleted file mode 100644
index e5051ac..0000000
--- a/tests/functional/test_jenkins_slave.py
+++ /dev/null
@@ -1,50 +0,0 @@
-import os
-import pytest
-from juju.model import Model
-
-# Treat tests as coroutines
-pytestmark = pytest.mark.asyncio
-
-series = ['bionic']
-juju_repository = os.getenv('JUJU_REPOSITORY', '.').rstrip('/')
-
-
[e-mail]
-async def model():
-    model = Model()
-    await model.connect_current()
-    yield model
-    await model.disconnect()
-
-
[e-mail]
-async def apps(model):
-    apps = []
-    for entry in series:
-        app = model.applications['jenkins-slave-{}'.format(entry)]
-        apps.append(app)
-    return apps
-
-
[e-mail]
-async def units(apps):
-    units = []
-    for app in apps:
-        units.extend(app.units)
-    return units
-
-
[e-mail]('series', series)
-async def test_jenkins_slave_deploy(model, series):
-    # Starts a deploy for each series
-    await model.deploy('{}/builds/jenkins-slave'.format(juju_repository),
-                       series=series,
-                       application_name='jenkins-slave-{}'.format(series))
-    assert True
-
-
-async def test_jenkins_slave_status(apps, model):
-    # Verifies status for all deployed series of the charm
-    for app in apps:
-        await model.block_until(lambda: app.status == 'active')
-    assert True
diff --git a/tests/functional/tests.yaml b/tests/functional/tests.yaml
new file mode 100644
index 0000000..757a6ea
--- /dev/null
+++ b/tests/functional/tests.yaml
@@ -0,0 +1,14 @@
+charm_name: jenkins-slave
+tests:
+  - zaza.charm_tests.noop.tests.NoopTest
+configure:
+  - zaza.charm_tests.noop.setup.basic_setup
+gate_bundles:
+  - base-bionic
+dev_bundles:
+  - base-bionic
+smoke_bundles:
+  - base-bionic
+target_deploy_status:
+  jenkins:
+    workload-status-message: Jenkins is running
diff --git a/tests/tests.yaml b/tests/tests.yaml
new file mode 120000
index 0000000..19e19a7
--- /dev/null
+++ b/tests/tests.yaml
@@ -0,0 +1 @@
+functional/tests.yaml
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index d6b7675..99078b2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,17 +11,14 @@ setenv =
 [testenv:unit]
 commands = pytest -v --ignore {toxinidir}/tests/functional --cov=lib --cov=reactive --cov=actions --cov-report=term-missing --cov-branch
 deps = -r{toxinidir}/tests/unit/requirements.txt
-       -r{toxinidir}/requirements.txt
 setenv = PYTHONPATH={toxinidir}/lib
 
 [testenv:functional]
 passenv =
   HOME
-  JUJU_REPOSITORY
-  PATH
-commands = pytest -v --ignore {toxinidir}/tests/unit
+basepython = python3
+commands = functest-run-suite --keep-model
 deps = -r{toxinidir}/tests/functional/requirements.txt
-       -r{toxinidir}/requirements.txt
 
 [testenv:lint]
 commands = flake8