Merge ~afreiberger/charm-juju-controller:functional-test-lxd-profile into charm-juju-controller:master

[Drew Freiberger]

Added lxd-profile for functional testing

[Drew Freiberger (afreiberger)]

This creates an ubuntu charm with nested lxd-profile.yaml for functional testing in a lxd environment.

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

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

[Drew Freiberger (afreiberger)]

passed functional tests with the release of ~bootstack-charmers-next/juju-local from MR 392541.

[Alvaro Uria (aluria)]

lgtm.

review: Approve

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

Change successfully merged at revision 923c8e1b4d8cb3f948315c78b2bead4e414d54ae

diff --git a/Makefile b/Makefile
index 0a84b5f..69cd363 100644
--- a/Makefile
+++ b/Makefile
@@ -70,6 +70,11 @@ unittests:
 	@cd src && tox -e unit
 
 functional: build
+	@echo "Pulling prereqs for functional testing"
+	@-rm -rf testing-charms  # ignore errors as this may not exist
+	@mkdir testing-charms
+	@cd testing-charms && charm pull cs:ubuntu ubuntu-lxd-profile && cd ..
+	@cp src/tests/functional/lxd-profile.yaml testing-charms/ubuntu-lxd-profile
 	@echo "Executing functional tests in ${CHARM_BUILD_DIR}"
 	@cd src && CHARM_BUILD_DIR=${CHARM_BUILD_DIR} tox -e func
 
diff --git a/src/tests/functional/lxd-profile.yaml b/src/tests/functional/lxd-profile.yaml
 new file mode 100644
index 0000000..56f8e4d
--- /dev/null
+++ b/src/tests/functional/lxd-profile.yaml
@@ -0,0 +1,4 @@
+# LXD Profile supporting privileged container for juju controller lxd on lxd
+config:
+  security.privileged: "true"
+  security.nesting: "true"
diff --git a/src/tests/functional/tests/bundles/base.yaml b/src/tests/functional/tests/bundles/base.yaml
index 81a95d1..d87988f 100644
--- a/src/tests/functional/tests/bundles/base.yaml
+++ b/src/tests/functional/tests/bundles/base.yaml
@@ -1,7 +1,6 @@
 description: "juju-controller charm test bundle"
 applications:
   ubuntu:
-    charm: "ubuntu"
     num_units: 1
   juju-local:
     charm: "cs:~bootstack-charmers-next/juju-local"
diff --git a/src/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2 b/src/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2
 new file mode 100644
index 0000000..4d6e8b6
--- /dev/null
+++ b/src/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2
@@ -0,0 +1,3 @@
+applications:
+  ubuntu:
+    charm: {{ CHARM_BUILD_DIR }}/../testing-charms/ubuntu-lxd-profile
diff --git a/src/tests/functional/tests/tests_juju_controller.py b/src/tests/functional/tests/tests_juju_controller.py
index da69629..110cb20 100644
--- a/src/tests/functional/tests/tests_juju_controller.py
+++ b/src/tests/functional/tests/tests_juju_controller.py
@@ -86,7 +86,8 @@ class JujuControllerTestBase(unittest.TestCase):
         """Deploy juju-controller charm."""
         model.scp_to_unit(cls.unit, str(BUILT_CHARM), "/home/ubuntu", scp_opts="-r")
         cls.run_remote_juju(
-            "deploy", "-n 3 --to 0,1,2 /home/ubuntu/juju-controller juju-controller",
+            "deploy",
+            "-n 3 --to 0,1,2 /home/ubuntu/juju-controller juju-controller",
         )
         block_until_inner_app(cls.unit, "controller", "juju-controller")
 
diff --git a/src/tests/unit/conftest.py b/src/tests/unit/conftest.py
index 64f110c..620a77d 100644
--- a/src/tests/unit/conftest.py
+++ b/src/tests/unit/conftest.py
@@ -95,7 +95,9 @@ def agent_conf_sample(agent_conf_sample_path):
 
 @pytest.fixture
 def jujucontroller(
-    mock_hookenv_config, monkeypatch, agent_conf_sample,
+    mock_hookenv_config,
+    monkeypatch,
+    agent_conf_sample,
 ):
     """Mock the JujuControllerHelper.