Merge lp:~simpoir/landscape-charm/juju-deploy-err into lp:~landscape/landscape-charm/trunk

[Simon Poirier]

Replace juju-deployer by plain "juju deploy" in integration tests to allow testing on bionic.

This branch gives some love to charm integration tests.

This should allow integration-tests to run on top of bionic (current release).
(focal won't run yet because there are still bits of python27 in there)
* get rid of juju-deployer, which is most definitely broken/dead
* mild PY3 compat fixes
* some unbroken tests

For testing, it assumes you have a juju model accessible.
So I encourage setting lxd config security.nesting=true if you're already
running this in a container (and you should) and doing a juju bootstrap.

FWIW xenial still deploys and passes tests, though it's not a supported
series for recent landscape release.

[Maximiliano Bertacchini (maxiberta)]

Looks good to me! Locally tested test, test-depends, integration-test, bundles-local-charm, deploy.

review: Approve

=== modified file 'Makefile'
--- Makefile	2019-05-24 12:41:48 +0000
+++ Makefile	2021-07-23 23:12:40 +0000
@@ -1,9 +1,9 @@
 PYTHON := /usr/bin/env python
 
 test:
-	trial lib
+	PYTHONPATH=. trial lib
 	# For now only the install hook runs against python3
-	trial3 lib/tests/test_apt.py lib/tests/test_install.py
+	PYTHONPATH=. trial3 lib/tests/test_apt.py lib/tests/test_install.py
 
 ci-test:
 	./dev/ubuntu-deps
@@ -15,8 +15,7 @@
 		apache2 postgresql juju-gui haproxy rabbitmq-server nfs
 
 test-depends: bundles
-	pip install --user bundletester juju-deployer
-	pip3 install --user amulet
+	PIP_IGNORE_INSTALLED=0 pip3 install --user amulet
 	cd tests && python3 test_helpers.py
 
 bundles-checkout:
@@ -31,9 +30,6 @@
 bundles: bundles-checkout
 	bundles/render-bundles
 
-bundles-local-branch: bundles-checkout
-	bundles/render-bundles --landscape-branch $(CURDIR)
-
 bundles-local-charm: bundles-checkout
 	bundles/render-bundles --landscape-charm $(CURDIR)
 
@@ -45,19 +41,19 @@
 	fi
 
 integration-test: test-depends
-	python2 ~/.local/bin/bundletester -v -l DEBUG --skip-implicit -t .
+	./tests/01-basic
 
 # Run integration tests using the LDS package from the lds-trunk PPA
 integration-test-trunk: secrets
 	LS_CHARM_SOURCE=lds-trunk-ppa $(MAKE) $(subst -trunk,,$@)
 
-deploy-dense-maas: bundles-local-branch config
+deploy-dense-maas: bundles-local-charm config
 	./dev/deployer dense-maas
 
-deploy-dense-maas-dev: bundles-local-branch config repo-file-trunk
+deploy-dense-maas-dev: bundles-local-charm config repo-file-trunk
 	./dev/deployer dense-maas --flags juju-debug
 
-deploy: bundles-local-branch
+deploy: bundles-local-charm
 	./dev/deployer scalable
 
 repo-file-trunk: secrets config

=== modified file 'README.md'
--- README.md	2020-02-27 15:39:24 +0000
+++ README.md	2021-07-23 23:12:40 +0000
@@ -62,13 +62,11 @@
 Integration Testing
 ===================
 
-This charm makes use of juju-deployer and the charm-tools package to enable end-to-end integration testing.  This is how you proceed with running them:
+This charm had juju-deployer and charm-tools tests. Those being EOL, some integration-test still exist, and can be executed using a "juju deploy" directly. This is how you proceed with running them:
 
     $ juju bootstrap localhost
     $ make integration-test
 
 Or if you want to use the packages from the lds-trunk PPA:
 
-    $ JUJU_MODEL=<model> make integration-test-trunk
-
-The JUJU_MODEL environment variable can be omitted if you want to use the current model.
+    $ make integration-test-trunk

=== modified file 'dev/deploy-landscape-client'
--- dev/deploy-landscape-client	2015-06-19 09:11:27 +0000
+++ dev/deploy-landscape-client	2021-07-23 23:12:40 +0000
@@ -1,12 +1,12 @@
 #!/usr/bin/python3
 """
 This script looks at the current Juju environment and generates a
-juju-deployer config for landscape-client that is configured to talk to
+juju bundle for landscape-client that is configured to talk to
 the deployed landscape-server service. The URLs and SSL certificate are
 taken from the deployed landscape-server units.
 
 By default, landscape-client will be deployed, but you can choose to
-only generate the juju-deployer config and deploy manually:
+only generate the juju bundle and deploy manually:
 
     deploy-landscape-client --no-deploy > landscape-client.yaml
 
@@ -119,7 +119,7 @@
 
     if args.deploy:
         print("Deploying landscape-client.", file=stderr)
-        subprocess.check_call(["juju-deployer", "-c", config_path])
+        subprocess.check_call(["juju deploy", config_path])
     print("Cleaning up {}".format(tempdir), file=stderr)
     shutil.rmtree(tempdir)
 

=== modified file 'dev/deployer'
--- dev/deployer	2016-09-14 16:17:08 +0000
+++ dev/deployer	2021-07-23 23:12:40 +0000
@@ -13,10 +13,10 @@
 
 
 class Deployer(object):
-    """Simple wrapper around juju-deployer.
+    """Simple wrapper around juju deploy (used to be juju-deployer).
 
     It creates a temporary directory that will act as local charm repository
-    for juju-deployer so it can deploy the current charm branch as local
+    for juju deploy so it can deploy the current charm branch as local
     charm.
 
     It also overrides the configuration in the stock bundles, accounting for
@@ -53,7 +53,7 @@
         @param source_bundle_file: The bundle file to override.
         """
         # Will create a config file with option values overridden for use in
-        # the juju deployer commandline to add a custom license-file to the
+        # the juju deploy commandline to add a custom license-file to the
         # deployment.
         local_yaml_file = os.path.join(tmpdir, "99-local.yaml")
         with open(source_bundle_file, "r") as bundle_content:
@@ -80,8 +80,8 @@
 
     def deploy(self, timeout=900):
         """
-        Use juju-deployer to deploy the target deployment type on current
-        `juju env`.
+        Use juju deploy to deploy the target deployment type on current
+        juju model.
 
         @param timeout: timeout in seconds (int or string is OK)
         """
@@ -100,22 +100,21 @@
                 self._stage_deployer_dir(deployer_dir, series)
             updated_bundle_file = self._create_local_yaml(
                 deployer_dir, original_bundle)
-            # The -w 30 is there to allow things to settle a bit before
-            # issuing a 'juju run' to wait for all the relations to settle.
-            args = ["juju-deployer", "-vdWL", "-w 30"]
-            args.extend(["-c", updated_bundle_file])
-            if timeout is not None:
-                args.extend(["--timeout", str(timeout)])
+            args = ["juju", "deploy"]
+            args.append(updated_bundle_file)
             logging.info("(cwd=%s) RUN: %s" % (deployer_dir, args))
             subprocess.check_call(args, cwd=deployer_dir)
             logging.info("Waiting for relations to settle")
-            subprocess.check_output(["juju", "run", "--all", "/bin/true"])
+            subprocess.check_output([
+                "juju", "run", "--all", "--timeout={}s".format(timeout),
+                "/bin/true"])
             deploy_time = int(round(time.time() - start))
             logging.info(
                 "Deployment usable after {} seconds".format(deploy_time))
-            haproxy_ip = subprocess.check_output(
-                ["juju-deployer", "-f", "haproxy"])
-            haproxy_ip = haproxy_ip.decode("utf-8").strip()
+            juju_status = yaml.load(subprocess.check_output([
+                "juju", "status", "--format=yaml"]))
+            haproxies = juju_status["applications"]["haproxy"]["units"]
+            haproxy_ip = list(haproxies.values())[0]["public-address"]
             logging.info("Landscape URL: https://{}/".format(haproxy_ip))
         finally:
             if deployer_dir is not None:
@@ -138,7 +137,7 @@
 
 
 def get_parser():
-    parser = ArgumentParser(description="Simple wrapper around juju-deployer")
+    parser = ArgumentParser(description="Simple wrapper around juju deploy")
     parser.add_argument(
         "target", choices=("scalable", "dense", "dense-maas"),
         help="target deployment type")

=== modified file 'dev/ubuntu-deps'
--- dev/ubuntu-deps	2019-01-17 14:23:49 +0000
+++ dev/ubuntu-deps	2021-07-23 23:12:40 +0000
@@ -5,17 +5,17 @@
 CODENAME=$(lsb_release -cs)
 
 # Install add-apt-repository (packaging differs across releases).
-sudo apt-get -y install python-software-properties
+sudo apt-get -y install software-properties-common
 
 # 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-2.0 charm-tools python3 \
+sudo apt-get -y install juju-2.0 python3 \
     python3-yaml curl python3-zope.testrunner \
-    python3-amulet python3-fixtures python3-jinja2 python3-fixtures \
+    python3-fixtures python3-jinja2 python3-fixtures \
     python3-psutil python3-twisted python3-flake8 \
     python3-path python3-libcharmstore python3-zope.testrunner python3-six \
-    python-twisted-core
+    python-twisted-core python3-pip
 
 sudo apt-get -y install python-fixtures python-six python-yaml dpkg-dev \
     pbuilder dh-make python-jinja2 python-psutil python-six

=== modified file 'lib/tests/test_install.py'
--- lib/tests/test_install.py	2019-05-28 20:36:35 +0000
+++ lib/tests/test_install.py	2021-07-23 23:12:40 +0000
@@ -53,7 +53,7 @@
         os.chmod(hook, 0o755)
         self.hookenv.config()["source"] = "ppa:landscape/14.10"
         self.assertEqual(1, self.hook())
-        self.assertEqual(
+        self.assertIn(
             "Command '%s' returned non-zero exit status 127" % hook,
             self.hookenv.messages[-1][0])
 

=== modified file 'tests/basic/test_service.py'
--- tests/basic/test_service.py	2016-09-15 07:38:13 +0000
+++ tests/basic/test_service.py	2021-07-23 23:12:40 +0000
@@ -180,6 +180,12 @@
     def test_update_security_db_cron(self):
         """Verify that the update_security_db cron job runs without errors."""
         script = "/opt/canonical/landscape/scripts/update_security_db.sh"
+        # remove some extra sleep which would make this test timeout
+        check_output([
+            "juju", "ssh", self.layer.cron_unit, "sudo", "sed", "-e",
+            "/^sleep/d", "-i", script
+        ])
+
         output, status = self.environment.run_script_on_cron_unit(
             script, self.layer)
         self.assertCronStatus(status, output, "update_security_db_cron")
@@ -222,6 +228,11 @@
             "sudo cp {config_dir}/hash-id-databases-sample.conf"
             " {config_dir}/hash-id-databases.conf".format(
                 config_dir=config_dir))
+        self.environment.run_command_on_landscape(
+            "sudo sed -i 's,^url.*,url={url},' "
+            "{config_dir}/hash-id-databases.conf".format(
+                config_dir=config_dir,
+                url="http://ppa.launchpad.net/simpoir/dummy-test-only/ubuntu"))
 
         script = "/opt/canonical/landscape/scripts/hash_id_databases.sh"
         output, status = self.environment.run_script_on_cron_unit(

=== modified file 'tests/helpers.py'
--- tests/helpers.py	2019-01-17 14:23:49 +0000
+++ tests/helpers.py	2021-07-23 23:12:40 +0000
@@ -6,6 +6,7 @@
 import sys
 import yaml
 import os
+import path
 import subprocess
 import tempfile
 import json
@@ -20,6 +21,8 @@
 from fixtures import Fixture, TestWithFixtures
 
 from amulet import Deployment
+from amulet.helpers import INFRA_FAIL, raise_status
+from amulet.sentry import SentryError, Talisman
 
 from zope.testrunner import run
 
@@ -43,8 +46,10 @@
         },
     "haproxy": {},
     "landscape": {
-        "branch": ".",
-        "memory": "2G"},
+        "charm": os.getcwd(),
+        # If you get OOM killed by LXD host (e.g. test_update_security_db_cron)
+        # the memory quota isn't high enough.
+        "memory": "4G"},
 }
 
 
@@ -77,6 +82,22 @@
         self._dense_maas = os.environ.get("DENSE_MAAS", "0") == "1"
         self._tempfile = tempfile
 
+    def _amulet_setup(self):
+        """Like Deployement.setup(), without using defunct juju-deployer."""
+        timeout = 900
+        with path.tempdir(prefix='amulet-juju-deployer-') as tmpdir:
+            schema_file = tmpdir / 'deployer-schema.yaml'
+            schema_file.write_text(yaml.dump(self._get_bundle()))
+            with self._deployment._deploy_w_timeout(timeout):
+                self._subprocess.check_call(
+                    ["juju", "deploy", str(schema_file)])
+        try:
+            self._deployment.sentry = Talisman(
+                self._deployment.services, timeout=900,
+                juju_env=self._deployment.juju_env)
+        except SentryError as e:
+            raise_status(INFRA_FAIL, msg=e)
+
     def setUp(self):
         super(EnvironmentFixture, self).setUp()
         if not self._deployment.deployed:
@@ -84,7 +105,7 @@
                 self._configure_for_dense_maas()
             self._deployment.load(self._get_bundle())
             with self._enable_sample_hashids():
-                self._deployment.setup(timeout=self._timeout)
+                self._amulet_setup()
             self._deployment.sentry.wait(self._timeout)
 
     def get_haproxy_public_address(self, unit=None):
@@ -178,7 +199,7 @@
         post_data = ("login.email=%s&login.password=%s&login=Login&"
                      "form-security-token=%s" % (email, password, token))
         return self.check_url(
-            "/redirect", "<h2>Organisation</h2>", post_data=post_data,
+            "/redirect", "<h2>Standalone Account</h2>", post_data=post_data,
             cookie_jar=cookie_file)
 
     def check_service(self, name, state="up", attempts=2, interval=5):