Merge ~cjwatson/launchpad:charm-focal into launchpad:master

[Colin Watson]

charm: Bump to focal

This should work now, but if it doesn't it'll be easier for me to debug it into shape after landing this and having the output of the build job in Swift to work with. :-)

[Jürgen Gmach (jugmac00)]

review: Approve

diff --git a/charm/Makefile b/charm/Makefile
index 046d50d..2e659ca 100644
--- a/charm/Makefile
+++ b/charm/Makefile
@@ -8,7 +8,7 @@ TMPDIR := $(CURDIR)/tmp
 CHARM_LAYERS_DIR := $(TMPDIR)/deps/ols-layers/layer
 CHARM_INTERFACES_DIR := $(TMPDIR)/deps/ols-layers/interface
 
-CHARM_SERIES ?= 18.04
+CHARM_SERIES ?= 20.04
 ARCH := $(shell dpkg --print-architecture)
 charm_file = $(1)_ubuntu-$(CHARM_SERIES)-$(ARCH).charm
 
diff --git a/charm/bundle.yaml.in b/charm/bundle.yaml.in
index e5c5c67..ea92c02 100644
--- a/charm/bundle.yaml.in
+++ b/charm/bundle.yaml.in
@@ -1,8 +1,8 @@
-series: bionic
+series: focal
 description: "Launchpad development bundle"
 applications:
   launchpad-appserver:
-    charm: ./dist/launchpad-appserver_ubuntu-18.04-amd64.charm
+    charm: ./dist/launchpad-appserver_ubuntu-20.04-amd64.charm
     num_units: 1
     options:
       build_label: "%BUILD_LABEL%"
diff --git a/charm/launchpad-appserver/charmcraft.yaml b/charm/launchpad-appserver/charmcraft.yaml
index a6f2757..2a40540 100644
--- a/charm/launchpad-appserver/charmcraft.yaml
+++ b/charm/launchpad-appserver/charmcraft.yaml
@@ -2,10 +2,10 @@ type: charm
 bases:
   - build-on:
     - name: ubuntu
-      channel: "18.04"
+      channel: "20.04"
     run-on:
     - name: ubuntu
-      channel: "18.04"
+      channel: "20.04"
 parts:
   launchpad-appserver:
     source: .
diff --git a/charm/launchpad-appserver/metadata.yaml b/charm/launchpad-appserver/metadata.yaml
index 321f110..c778bcf 100644
--- a/charm/launchpad-appserver/metadata.yaml
+++ b/charm/launchpad-appserver/metadata.yaml
@@ -11,5 +11,5 @@ tags:
   # https://juju.is/docs/charm-metadata#heading--charm-store-fields
   - network
 series:
-  - bionic
+  - focal
 subordinate: false
diff --git a/charm/launchpad/charmcraft.yaml b/charm/launchpad/charmcraft.yaml
index 5b50137..0f68a93 100644
--- a/charm/launchpad/charmcraft.yaml
+++ b/charm/launchpad/charmcraft.yaml
@@ -2,10 +2,10 @@ type: charm
 bases:
   - build-on:
     - name: ubuntu
-      channel: "18.04"
+      channel: "20.04"
     run-on:
     - name: ubuntu
-      channel: "18.04"
+      channel: "20.04"
 parts:
   launchpad:
     source: .
diff --git a/charm/launchpad/metadata.yaml b/charm/launchpad/metadata.yaml
index 79f06eb..756f802 100644
--- a/charm/launchpad/metadata.yaml
+++ b/charm/launchpad/metadata.yaml
@@ -9,5 +9,5 @@ tags:
   # https://juju.is/docs/charm-metadata#heading--charm-store-fields
   - network
 series:
-  - bionic
+  - focal
 subordinate: false
diff --git a/ols-vms.conf b/ols-vms.conf
index 9a5c538..bad8b0b 100644
--- a/ols-vms.conf
+++ b/ols-vms.conf
@@ -1,6 +1,6 @@
 # Options defined here provide defaults for all sections
 vm.architecture = amd64
-vm.release = bionic
+vm.release = focal
 
 apt.sources = ppa:launchpad/ppa
 vm.packages = launchpad-dependencies