Merge ~sudeephb/charm-juju-local:specify_series into charm-juju-local:master

[Sudeep Bhandari]

Make controller series same as host series

Drop Xenial support

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

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

[Eric Chen (eric-chen)]

LGTM

review: Approve

[JamesLin (jneo8)]

review: Approve

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

Change successfully merged at revision e59aae36364c6a67ddef245f408d0f20220dd447

diff --git a/charmcraft.yaml b/charmcraft.yaml
index 475fc6b..ac5f07b 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -3,7 +3,7 @@ parts:
   charm:
     source: .
     plugin: reactive
-    build-snaps: [charm]
+    build-snaps: [charm/2.x/stable]
 bases:
     - build-on:
         - name: ubuntu
@@ -21,8 +21,4 @@ bases:
         - name: ubuntu
           channel: "18.04"
           architectures:
-              - amd64
-        - name: ubuntu
-          channel: "16.04"
-          architectures:
               - amd64
\ No newline at end of file
diff --git a/lib/lib_charm_juju_local.py b/lib/lib_charm_juju_local.py
index e6e8a0d..39fc880 100644
--- a/lib/lib_charm_juju_local.py
+++ b/lib/lib_charm_juju_local.py
@@ -36,9 +36,6 @@ class JujuLocalHelper:
                 ]
             )
 
-    def is_xenial(self):
-        return host.lsb_release()["DISTRIB_CODENAME"] == "xenial"
-
     def lxd_migrate(self):
         """Run lxd.migrate if lxd debian package is installed.
 
@@ -49,40 +46,31 @@ class JujuLocalHelper:
             subprocess.call("sudo lxd.migrate -yes", shell=True)
 
     def lxd_init(self):
-        if self.is_xenial():
-            install_sh = "lxd init --auto --storage-backend dir"
-            subprocess.call(install_sh, shell=True)
-            self.render_lxd_bridge()
-            host.service_restart("lxd-bridge")
-        else:
-            # bionic or newer
-            install_sh = textwrap.dedent(
-                """
-                lxd init --auto --storage-backend dir
-                lxc network delete lxdbr0
-                lxc network create lxdbr0 ipv4.address=auto ipv6.address=none"""
-            )
-            subprocess.call(install_sh, shell=True)
+        install_sh = textwrap.dedent(
+            """
+            lxd init --auto --storage-backend dir
+            lxc network delete lxdbr0
+            lxc network create lxdbr0 ipv4.address=auto ipv6.address=none"""
+        )
+        subprocess.call(install_sh, shell=True)
 
     def setup_juju(self):
         subprocess.call("sudo usermod -aG lxd ubuntu", shell=True)
-        if self.is_xenial():
-            aa_profile = "lxc.aa_profile"
-        else:
-            aa_profile = "lxc.apparmor.profile"
+        aa_profile = "lxc.apparmor.profile"
         if host.is_container():
             subprocess.call(
                 "sudo -u ubuntu lxc profile set default "
                 "raw.lxc {}=unconfined".format(aa_profile),
                 shell=True,
             )
+        series = host.lsb_release()["DISTRIB_CODENAME"]
         subprocess.call(
             textwrap.dedent(
-                """
+                f"""
                 sudo -u ubuntu bash <<eof
                 /snap/bin/juju clouds
                 /snap/bin/lxc network set lxdbr0 ipv6.address none
-                /snap/bin/juju bootstrap localhost lxd
+                /snap/bin/juju bootstrap --bootstrap-series={series} localhost lxd
                 eof"""
             ),
             shell=True,
diff --git a/tests/bundles/overlays/xenial.yaml.j2 b/tests/bundles/overlays/xenial.yaml.j2
deleted file mode 100644
index 2cfb90e..0000000
--- a/tests/bundles/overlays/xenial.yaml.j2
+++ /dev/null
@@ -1 +0,0 @@
-series: xenial
diff --git a/tests/bundles/xenial.yaml b/tests/bundles/xenial.yaml
deleted file mode 120000
index f81f6ff..0000000
--- a/tests/bundles/xenial.yaml
+++ /dev/null
@@ -1 +0,0 @@
-base.yaml
\ No newline at end of file
diff --git a/tests/tests.yaml b/tests/tests.yaml
index 7c9d08b..4476d69 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -5,7 +5,6 @@ gate_bundles:
   - jammy
   - focal
   - bionic
-  - xenial
 dev_bundles:
   - jammy
 smoke_bundles: