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

[Haw Loeung]

Fixed stuck on blocked state discovered from functional testing

Unmerged commits

63b6101... by Haw Loeung on 2019-08-06

Fixed stuck on blocked state discovered from functional testing

34fc4c7... by Haw Loeung on 2019-08-06

Ignore more deprecated warnings

5cde3e0... by Haw Loeung on 2019-08-06

Fixed to handle jenkins' non-ready status and deploy nrpe

d96d5f6... by Haw Loeung on 2019-08-02

Deployable functional test

241b827... by Haw Loeung on 2019-06-20

Work around not being able to specify location to bundles and tests.yaml

2fdb42b... by Haw Loeung on 2019-06-20

Initial work replacing functional tests with zaza

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/reactive/jenkins_slave.py b/reactive/jenkins_slave.py
index ac888a4..68421be 100755
--- a/reactive/jenkins_slave.py
+++ b/reactive/jenkins_slave.py
@@ -65,7 +65,6 @@ def install():
         host.service('enable', 'jenkins-slave')
 
     status.maintenance('Installing jenkins-slave... done.')
-    reactive.clear_flag('jenkins-slave.blocked')
     reactive.clear_flag('jenkins-slave.configured')
     reactive.set_flag('jenkins-slave.installed')
 
@@ -73,14 +72,12 @@ def install():
 @reactive.when('config.changed')
 def config_changed():
     status.maintenance('Configuration changed')
-    reactive.clear_flag('jenkins-slave.blocked')
     reactive.clear_flag('jenkins-slave.configured')
     reactive.clear_flag('nagios-nrpe.configured')
 
 
 @reactive.when('jenkins-slave.installed')
 @reactive.when_not('jenkins-slave.configured')
[e-mail]_not('jenkins-slave.blocked')
 def configure_jenkins_slave():
     status.maintenance('configuring jenkins-slave')
     reactive.clear_flag('jenkins-slave.active')
@@ -97,7 +94,7 @@ def configure_jenkins_slave():
     else:
         status.maintenance("No 'master_url' set; not configuring slave at this time.")
         status.blocked("requires either slave relation or 'master_url'")
-        reactive.set_flag('jenkins-slave.blocked')
+        reactive.clear_flag('jenkins-slave.active')
         return
 
     file_to_units('files/jenkins-slave-sudoers', '/etc/sudoers.d/jenkins', perms=0o440)
@@ -106,11 +103,6 @@ def configure_jenkins_slave():
     reactive.set_flag('jenkins-slave.configured')
 
 
[e-mail]('jenkins-slave.blocked')
-def blocked_on_jenkins_url():
-    reactive.clear_flag('jenkins-slave.active')
-
-
 @reactive.when('jenkins-slave.configured')
 @reactive.when('jenkins-slave.active')
 @reactive.when('nrpe-external-master.available')
@@ -151,7 +143,6 @@ def set_active():
 @reactive.hook('slave-relation-joined', 'slave-relation-changed')
 def slave_relation_changed():
     reactive.set_flag('slave-relation.available')
-    reactive.clear_flag('jenkins-slave.blocked')
     reactive.clear_flag('jenkins-slave.configured')
     reactive.clear_flag('slave-relation.configured')
 
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/tests/unit/test_jenkins_slave.py b/tests/unit/test_jenkins_slave.py
index a09c457..efcdb7f 100644
--- a/tests/unit/test_jenkins_slave.py
+++ b/tests/unit/test_jenkins_slave.py
@@ -81,6 +81,7 @@ class TestSetDefaultConf(unittest.TestCase):
 
         apt.reset_mock()
         status.active.reset_mock()
+        status.blocked.reset_mock()
         status.maintenance.reset_mock()
 
     @mock.patch('charms.reactive.clear_flag')
@@ -98,8 +99,7 @@ class TestSetDefaultConf(unittest.TestCase):
         '''Test correct flags are set via config-changed charm hook'''
         jenkins_slave.config_changed()
         self.assertFalse(status.maintenance.assert_called())
-        expected = [mock.call('jenkins-slave.blocked'),
-                    mock.call('jenkins-slave.configured'),
+        expected = [mock.call('jenkins-slave.configured'),
                     mock.call('nagios-nrpe.configured')]
         self.assertFalse(clear_flag.assert_has_calls(expected, any_order=True))
 
@@ -174,7 +174,7 @@ class TestSetDefaultConf(unittest.TestCase):
         unitdata_kv.return_value = {}
         jenkins_slave.configure_jenkins_slave()
         self.assertFalse(write_default_conf.assert_not_called())
-        self.assertFalse(set_flag.assert_has_calls([mock.call('jenkins-slave.blocked')], any_order=True))
+        self.assertFalse(status.blocked.assert_called())
         self.assertFalse(clear_flag.assert_has_calls([mock.call('jenkins-slave.active')], any_order=True))
 
     @mock.patch('charms.reactive.clear_flag')
@@ -209,11 +209,6 @@ class TestSetDefaultConf(unittest.TestCase):
         expected = [mock.call('jenkins-slave.active'), mock.call('nagios-nrpe.configured')]
         self.assertFalse(clear_flag.assert_has_calls(expected, any_order=True))
 
-    @mock.patch('charms.reactive.clear_flag')
-    def test_blocked_on_jenkins_url(self, clear_flag):
-        jenkins_slave.blocked_on_jenkins_url()
-        self.assertFalse(clear_flag.assert_has_calls([mock.call('jenkins-slave.active')], any_order=True))
-
     @mock.patch('charmhelpers.core.host.service_running')
     @mock.patch('charmhelpers.core.host.service_restart')
     @mock.patch('charmhelpers.core.host.service_start')
@@ -241,7 +236,6 @@ class TestSetDefaultConf(unittest.TestCase):
     def test_hook_slave_relation_changed_flags(self, set_flag, clear_flag):
         jenkins_slave.slave_relation_changed()
         expected = [
-            mock.call('jenkins-slave.blocked'),
             mock.call('jenkins-slave.configured'),
             mock.call('slave-relation.configured'),
         ]
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