Launchpad itself

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

  1. Git
  2. lp:~cjwatson/launchpad
  3. charm-focal
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: a4c8c7866c25a4c99753027ad114362b5d518dbf
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:charm-focal
Merge into: launchpad:master
Diff against target: 96 lines (+10/-10)
7 files modified
charm/Makefile (+1/-1)
charm/bundle.yaml.in (+2/-2)
charm/launchpad-appserver/charmcraft.yaml (+2/-2)
charm/launchpad-appserver/metadata.yaml (+1/-1)
charm/launchpad/charmcraft.yaml (+2/-2)
charm/launchpad/metadata.yaml (+1/-1)
ols-vms.conf (+1/-1)
Reviewer Review Type Date Requested Status
Jürgen Gmach Approve
Review via email: mp+429710@code.launchpad.net

Commit message

charm: Bump to focal

Description of the change

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. :-)

To post a comment you must log in.
Revision history for this message
Jürgen Gmach (jugmac00) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charm/Makefile b/charm/Makefile
2index 046d50d..2e659ca 100644
3--- a/charm/Makefile
4+++ b/charm/Makefile
5@@ -8,7 +8,7 @@ TMPDIR := $(CURDIR)/tmp
6 CHARM_LAYERS_DIR := $(TMPDIR)/deps/ols-layers/layer
7 CHARM_INTERFACES_DIR := $(TMPDIR)/deps/ols-layers/interface
8
9-CHARM_SERIES ?= 18.04
10+CHARM_SERIES ?= 20.04
11 ARCH := $(shell dpkg --print-architecture)
12 charm_file = $(1)_ubuntu-$(CHARM_SERIES)-$(ARCH).charm
13
14diff --git a/charm/bundle.yaml.in b/charm/bundle.yaml.in
15index e5c5c67..ea92c02 100644
16--- a/charm/bundle.yaml.in
17+++ b/charm/bundle.yaml.in
18@@ -1,8 +1,8 @@
19-series: bionic
20+series: focal
21 description: "Launchpad development bundle"
22 applications:
23 launchpad-appserver:
24- charm: ./dist/launchpad-appserver_ubuntu-18.04-amd64.charm
25+ charm: ./dist/launchpad-appserver_ubuntu-20.04-amd64.charm
26 num_units: 1
27 options:
28 build_label: "%BUILD_LABEL%"
29diff --git a/charm/launchpad-appserver/charmcraft.yaml b/charm/launchpad-appserver/charmcraft.yaml
30index a6f2757..2a40540 100644
31--- a/charm/launchpad-appserver/charmcraft.yaml
32+++ b/charm/launchpad-appserver/charmcraft.yaml
33@@ -2,10 +2,10 @@ type: charm
34 bases:
35 - build-on:
36 - name: ubuntu
37- channel: "18.04"
38+ channel: "20.04"
39 run-on:
40 - name: ubuntu
41- channel: "18.04"
42+ channel: "20.04"
43 parts:
44 launchpad-appserver:
45 source: .
46diff --git a/charm/launchpad-appserver/metadata.yaml b/charm/launchpad-appserver/metadata.yaml
47index 321f110..c778bcf 100644
48--- a/charm/launchpad-appserver/metadata.yaml
49+++ b/charm/launchpad-appserver/metadata.yaml
50@@ -11,5 +11,5 @@ tags:
51 # https://juju.is/docs/charm-metadata#heading--charm-store-fields
52 - network
53 series:
54- - bionic
55+ - focal
56 subordinate: false
57diff --git a/charm/launchpad/charmcraft.yaml b/charm/launchpad/charmcraft.yaml
58index 5b50137..0f68a93 100644
59--- a/charm/launchpad/charmcraft.yaml
60+++ b/charm/launchpad/charmcraft.yaml
61@@ -2,10 +2,10 @@ type: charm
62 bases:
63 - build-on:
64 - name: ubuntu
65- channel: "18.04"
66+ channel: "20.04"
67 run-on:
68 - name: ubuntu
69- channel: "18.04"
70+ channel: "20.04"
71 parts:
72 launchpad:
73 source: .
74diff --git a/charm/launchpad/metadata.yaml b/charm/launchpad/metadata.yaml
75index 79f06eb..756f802 100644
76--- a/charm/launchpad/metadata.yaml
77+++ b/charm/launchpad/metadata.yaml
78@@ -9,5 +9,5 @@ tags:
79 # https://juju.is/docs/charm-metadata#heading--charm-store-fields
80 - network
81 series:
82- - bionic
83+ - focal
84 subordinate: false
85diff --git a/ols-vms.conf b/ols-vms.conf
86index 9a5c538..bad8b0b 100644
87--- a/ols-vms.conf
88+++ b/ols-vms.conf
89@@ -1,6 +1,6 @@
90 # Options defined here provide defaults for all sections
91 vm.architecture = amd64
92-vm.release = bionic
93+vm.release = focal
94
95 apt.sources = ppa:launchpad/ppa
96 vm.packages = launchpad-dependencies

Subscribers

People subscribed via source and target branches

to status/vote changes: