Merge lp:~ack/landscape-charm/integration-tests-juju2 into lp:~landscape/landscape-charm/trunk

[Alberto Donato]

Update charm tests to support running them with juju2.

This uses bundletester instead of juju-test (which doesn't work with juju2).

Update charm tests to support running them with juju2.

This uses bundletester instead of juju-test (which doesn't work with juju2).

I created A temporary job for running them (and keep the juju1 running too) at https://ci.lscape.net/job/landscape-charm-test-2/

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Success
Revno: 397
Branch: lp:~ack/landscape-charm/integration-tests-juju2
Jenkins: https://ci.lscape.net/job/latch-test-trusty/616/

review: Approve (test results)

[Free Ekanayaka (free.ekanayaka)]

Nice, +1

review: Approve

[Adam Collard (adam-collard)]

review: Needs Fixing

[lp:~ack/landscape-charm/integration-tests-juju2]

398. By Alberto Donato on 2017-02-16

Fix juju2 terms.

399. By Alberto Donato on 2017-02-16

Fix juju2 terms.

400. By Alberto Donato on 2017-02-16

Don't set PYTHONPATH.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Fail
Revno: 400
Branch: lp:~ack/landscape-charm/integration-tests-juju2
Jenkins: https://ci.lscape.net/job/latch-test-trusty/630/

review: Needs Fixing (test results)

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Success
Revno: 400
Branch: lp:~ack/landscape-charm/integration-tests-juju2
Jenkins: https://ci.lscape.net/job/latch-test-trusty/632/

review: Approve (test results)

[Adam Collard (adam-collard)]

+1 thanks for the fixes

review: Approve

=== modified file 'HACKING.md'
--- HACKING.md	2016-06-29 07:35:10 +0000
+++ HACKING.md	2017-02-16 10:25:24 +0000
@@ -14,11 +14,11 @@
 
     make integration-test
 
-N.B., It will deploy into a real juju environment. It uses the juju-test
-command to facilitate this, which takes care of bootstrapping for you.  It
-will use whatever 'juju env' reports as your current environment.  It will use
-a number of machines to do this test -- it should work on a local environment
-(LXC), but could be quite resource intensive.
+N.B., It will deploy into a the current juju model. It uses the bundletester
+command to facilitate this. the `JUJU_MODEL` environment variable can be passed
+to specify a different model.  It will use a number of machines to do this test
+-- it should work on a local controller (LXD), but could be quite resource
+intensive.
 
 
 Running parts of the integration tests

=== modified file 'Makefile'
--- Makefile	2017-01-11 13:57:59 +0000
+++ Makefile	2017-02-16 10:25:24 +0000
@@ -9,23 +9,15 @@
 	./dev/ubuntu-deps
 	$(MAKE) test lint
 
-verify-juju-test:
-	@echo "Checking for ... "
-	@echo -n "juju-test: "
-	@if [ -z `which juju-test` ]; then \
-		echo -e "\nRun ./dev/ubuntu-deps to get the juju-test command installed"; \
-		exit 1;\
-	else \
-		echo "installed"; \
-	fi
-
 update-charm-revision-numbers: bundles
 	@dev/update-charm-revision-numbers \
 		$(EXTRA_UPDATE_ARGUMENTS) \
 		apache2 postgresql juju-gui haproxy rabbitmq-server nfs
 
-test-depends: verify-juju-test bundles
-	@cd tests && python3 test_helpers.py
+test-depends: bundles
+	pip install --user bundletester juju-deployer
+	pip3 install --user amulet
+	cd tests && python3 test_helpers.py
 
 bundles-checkout:
 	@if [ -d bundles ]; then \
@@ -53,7 +45,7 @@
 	fi
 
 integration-test: test-depends
-	juju test --set-e -p LS_CHARM_SOURCE,JUJU_HOME,JUJU_ENV,PG_MANUAL_TUNING,DENSE_MAAS -v --timeout 7200s
+	~/.local/bin/bundletester -v -l DEBUG --skip-implicit -t .
 
 # Run integration tests using the LDS package from the lds-trunk PPA
 integration-test-trunk: secrets

=== modified file 'README.md'
--- README.md	2016-06-29 07:14:33 +0000
+++ README.md	2017-02-16 10:25:24 +0000
@@ -90,12 +90,12 @@
 end-to-end integration testing.  This is how you proceed with running
 them:
 
-    # Make sure your JUJU_ENV is *not* bootstrapped, and:
-    $ JUJU_ENV=<env> make integration-test
+    $ juju bootstrap localhost
+    $ make integration-test
 
 Or if you want to use the LDS packages from the lds-trunk PPA:
 
-    $ JUJU_ENV=<env> make integration-test-trunk
+    $ JUJU_MODEL=<model> make integration-test-trunk
 
-The JUJU_ENV environment variable can be omitted if you want to use the
-current juju environment (as set by "juju switch").
+The JUJU_MDOEL environment variable can be omitted if you want to use the
+current model.

=== modified file 'dev/ubuntu-deps'
--- dev/ubuntu-deps	2016-10-28 12:58:21 +0000
+++ dev/ubuntu-deps	2017-02-16 10:25:24 +0000
@@ -10,9 +10,9 @@
 # Add the juju stable ppa, install charm-tools (juju-test plugin) and other deps
 sudo add-apt-repository -y ppa:juju/stable
 sudo apt-get update
-sudo apt-get -y install juju-deployer juju-core charm-tools python3 \
+sudo apt-get -y install juju-2.0 charm-tools python3 \
     python3-yaml curl python3-zope.testrunner \
-    python3-amulet python3-fixtures python3-jinja2 python3-fixtures\
+    python3-amulet python3-fixtures python3-jinja2 python3-fixtures \
     python3-psutil python3-twisted python3-flake8 \
     python3-path python3-libcharmstore python3-zope.testrunner python3-six
 

=== modified file 'tests/helpers.py'
--- tests/helpers.py	2016-09-15 07:38:13 +0000
+++ tests/helpers.py	2017-02-16 10:25:24 +0000
@@ -60,7 +60,7 @@
     """
 
     _timeout = 3000
-    _series = "trusty"
+    _series = "xenial"
     _deployment = Deployment(series=_series)
     _new_unit_target = None
 
@@ -476,7 +476,7 @@
 
     def _do_action(self, action, unit, action_params=None):
         """Execute an action on a unit, returning the id."""
-        command = ["juju", "action", "do", "--format=json", unit, action]
+        command = ["juju", "run-action", "--format=json", unit, action]
         if action_params is not None:
             sorted_action_params = sorted(
                 action_params.items(), key=itemgetter(0))
@@ -490,8 +490,8 @@
     def _fetch_action(self, action_id, wait=300):
         """Fetch the results of an action."""
         return json.loads(self._subprocess.check_output(
-            ["juju", "action", "fetch", "--format=json", "--wait", str(wait),
-             action_id]).decode("utf-8"))
+            ["juju", "show-action-output", "--format=json", "--wait",
+             str(wait), action_id]).decode("utf-8"))
 
     def _get_charm_dir(self):
         """Get the path to the root of the charm directory."""
@@ -592,9 +592,9 @@
     def _configure_for_dense_maas(self):
         """Configure the deployment for a dense MAAS configuration.
 
-        All units will be placed in an LXC on the bootstrap node.
+        All units will be placed in an LXD on the controller.
         """
-        self._new_unit_target = "lxc:0"
+        self._new_unit_target = "lxd:0"
         services = [
             service for service in DEFAULT_BUNDLE_CONTEXT.keys()
             if service != "name"]

=== modified file 'tests/test_helpers.py'
--- tests/test_helpers.py	2016-09-15 07:38:13 +0000
+++ tests/test_helpers.py	2017-02-16 10:25:24 +0000
@@ -99,7 +99,7 @@
         self.assertEqual(3000, self.deployment.timeout)
         self.assertEqual(3000, self.deployment.sentry.timeout)
         config = self.deployment.services["landscape-server"]
-        self.assertEqual("local:trusty/landscape-server", config["charm"])
+        self.assertEqual("local:xenial/landscape-server", config["charm"])
         self.assertTrue(os.environ["JUJU_REPOSITORY"].startswith("/tmp"))
 
     def test_get_haproxy_public_address(self):