turnip

Merge ~pelpsi/turnip:turnip-charms-upgrade-to-focal into turnip:master

  1. Git
  2. lp:~pelpsi/turnip
  3. turnip-charms-upgrade-to-focal
  4. Merge into master
Proposed by Simone Pelosi
Status: Merged
Approved by: Simone Pelosi
Approved revision: 4df234bd43d4ad42005e5471a1e5fd56045767d6
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~pelpsi/turnip:turnip-charms-upgrade-to-focal
Merge into: turnip:master
Diff against target: 766 lines (+92/-78)
15 files modified
charm/dependencies.txt (+1/-1)
charm/turnip-api/charmcraft.yaml (+12/-11)
charm/turnip-api/metadata.yaml (+1/-0)
charm/turnip-celery/charmcraft.yaml (+12/-11)
charm/turnip-celery/metadata.yaml (+1/-0)
charm/turnip-pack-backend/charmcraft.yaml (+12/-11)
charm/turnip-pack-backend/metadata.yaml (+1/-0)
charm/turnip-pack-frontend-git/charmcraft.yaml (+12/-11)
charm/turnip-pack-frontend-git/metadata.yaml (+1/-0)
charm/turnip-pack-frontend-http/charmcraft.yaml (+12/-11)
charm/turnip-pack-frontend-http/metadata.yaml (+1/-0)
charm/turnip-pack-frontend-ssh/charmcraft.yaml (+12/-11)
charm/turnip-pack-frontend-ssh/metadata.yaml (+1/-0)
charm/turnip-pack-virt/charmcraft.yaml (+12/-11)
charm/turnip-pack-virt/metadata.yaml (+1/-0)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+447756@code.launchpad.net

Commit message

Upgraded charms to focal

Updated layers to the latest commits
Updated charmcraft.yaml and metadata.yaml

To post a comment you must log in.
Revision history for this message
Simone Pelosi (pelpsi) wrote :

Blocked by : https://code.launchpad.net/~pelpsi/ols-charm-deps/+git/wheels/+merge/447788

Once the above is merged, charm-wheels must be updated accordingly.

Revision history for this message
Colin Watson (cjwatson) :
review: Approve
Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/turnip/422/

Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/turnip/423/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charm/dependencies.txt b/charm/dependencies.txt
2index 66e5dea..7d83558 100644
3--- a/charm/dependencies.txt
4+++ b/charm/dependencies.txt
5@@ -12,4 +12,4 @@ layer/status git+https://github.com/juju-solutions/layer-status;revno=02658f0f
6 layer/turnip-base ../../../layer/turnip-base;method=link
7 layer/turnip-storage ../../../layer/turnip-storage;method=link
8
9-charm-wheels git+https://git.launchpad.net/~canonical-launchpad-branches/turnip/+git/dependencies
10+charm-wheels git+https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
11diff --git a/charm/turnip-api/charmcraft.yaml b/charm/turnip-api/charmcraft.yaml
12index b652a94..04dbde1 100644
13--- a/charm/turnip-api/charmcraft.yaml
14+++ b/charm/turnip-api/charmcraft.yaml
15@@ -2,16 +2,16 @@ type: charm
16 bases:
17 - build-on:
18 - name: ubuntu
19- channel: "18.04"
20+ channel: "20.04"
21 architectures: [amd64]
22 run-on:
23 - name: ubuntu
24- channel: "18.04"
25+ channel: "20.04"
26 architectures: [amd64]
27 parts:
28 charm-wheels:
29- source: https://git.launchpad.net/~canonical-launchpad-branches/turnip/+git/dependencies
30- source-commit: "030fe3e51edfe8e8c8b3590b52c4792b21631f01"
31+ source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
32+ source-commit: "7bcd79fa4fca485eaf15ee9e2ee16f3ab902678d"
33 source-submodules: []
34 source-type: git
35 plugin: dump
36@@ -21,7 +21,7 @@ parts:
37 - "-charm-wheels"
38 interface-rabbitmq:
39 source: https://github.com/openstack/charm-interface-rabbitmq
40- source-commit: "571f4864c2f942d92991b3f413323a04c6f56d72"
41+ source-commit: "383121fc584d2d3bf9d233eba0d3708398a4c468"
42 source-submodules: []
43 source-type: git
44 plugin: dump
45@@ -33,7 +33,7 @@ parts:
46 - "-layers"
47 interface-http:
48 source: https://github.com/juju-solutions/interface-http
49- source-commit: "4a232c6998a0c7deac0c2362e7a9a4f1c776603b"
50+ source-commit: "632131b1f122daf6fb601fd4c9f1e4dbb1a92e09"
51 source-submodules: []
52 source-type: git
53 plugin: dump
54@@ -57,7 +57,7 @@ parts:
55 - "-layers"
56 interface-nrpe-external-master:
57 source: https://github.com/canonical-ols/nrpe-external-master-interface
58- source-commit: "20b2b9fb80613997cb99b8096040cbba72a0ef0c"
59+ source-commit: "3a195bf592c6b45a58fce0d398ba6921dd0bae3b"
60 source-submodules: []
61 source-type: git
62 plugin: dump
63@@ -69,7 +69,7 @@ parts:
64 - "-layers"
65 layer-apt:
66 source: https://git.launchpad.net/layer-apt
67- source-commit: "cf78622e68fe1ca97eb8993c5adc2616f9e110b9"
68+ source-commit: "76bddfb640ab8767fc7e4a4b73a4a4e781948f34"
69 source-submodules: []
70 source-type: git
71 plugin: dump
72@@ -81,7 +81,7 @@ parts:
73 - "-layers"
74 layer-basic:
75 source: https://github.com/juju-solutions/layer-basic
76- source-commit: "baf582236a7b946da4cd140fd6532a2e0c2774d5"
77+ source-commit: "e3affe74ff0c33e2fbfc560fcd1d873726c40233"
78 source-submodules: []
79 source-type: git
80 plugin: dump
81@@ -105,7 +105,7 @@ parts:
82 - "-layers"
83 layer-status:
84 source: https://github.com/juju-solutions/layer-status
85- source-commit: "02658f0f6b2d29316b79820b206cec532c0459c8"
86+ source-commit: "a7d7b6423db37a47611310039e6ed1929c0a2eab"
87 source-submodules: []
88 source-type: git
89 plugin: dump
90@@ -117,7 +117,7 @@ parts:
91 - "-layers"
92 launchpad-layers:
93 source: https://git.launchpad.net/launchpad-layers
94- source-commit: "466a8348106b0a14e4c1cf18fbafe13d1f927bad"
95+ source-commit: "300b0d9fd332c055395fe209512335cea03c7af3"
96 source-submodules: []
97 source-type: git
98 plugin: dump
99@@ -143,6 +143,7 @@ parts:
100 source: .
101 plugin: reactive
102 build-snaps: [charm]
103+ build-packages: [python3-dev]
104 build-environment:
105 - CHARM_LAYERS_DIR: $CRAFT_STAGE/layers/layer
106 - CHARM_INTERFACES_DIR: $CRAFT_STAGE/layers/interface
107diff --git a/charm/turnip-api/metadata.yaml b/charm/turnip-api/metadata.yaml
108index f506fcb..13c8578 100644
109--- a/charm/turnip-api/metadata.yaml
110+++ b/charm/turnip-api/metadata.yaml
111@@ -10,6 +10,7 @@ tags:
112 - network
113 - web_server
114 series:
115+ - focal
116 - bionic
117 - xenial
118 subordinate: false
119diff --git a/charm/turnip-celery/charmcraft.yaml b/charm/turnip-celery/charmcraft.yaml
120index 8afe6ef..e207b32 100644
121--- a/charm/turnip-celery/charmcraft.yaml
122+++ b/charm/turnip-celery/charmcraft.yaml
123@@ -2,16 +2,16 @@ type: charm
124 bases:
125 - build-on:
126 - name: ubuntu
127- channel: "18.04"
128+ channel: "20.04"
129 architectures: [amd64]
130 run-on:
131 - name: ubuntu
132- channel: "18.04"
133+ channel: "20.04"
134 architectures: [amd64]
135 parts:
136 charm-wheels:
137- source: https://git.launchpad.net/~canonical-launchpad-branches/turnip/+git/dependencies
138- source-commit: "030fe3e51edfe8e8c8b3590b52c4792b21631f01"
139+ source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
140+ source-commit: "7bcd79fa4fca485eaf15ee9e2ee16f3ab902678d"
141 source-submodules: []
142 source-type: git
143 plugin: dump
144@@ -21,7 +21,7 @@ parts:
145 - "-charm-wheels"
146 interface-rabbitmq:
147 source: https://github.com/openstack/charm-interface-rabbitmq
148- source-commit: "571f4864c2f942d92991b3f413323a04c6f56d72"
149+ source-commit: "383121fc584d2d3bf9d233eba0d3708398a4c468"
150 source-submodules: []
151 source-type: git
152 plugin: dump
153@@ -33,7 +33,7 @@ parts:
154 - "-layers"
155 interface-http:
156 source: https://github.com/juju-solutions/interface-http
157- source-commit: "4a232c6998a0c7deac0c2362e7a9a4f1c776603b"
158+ source-commit: "632131b1f122daf6fb601fd4c9f1e4dbb1a92e09"
159 source-submodules: []
160 source-type: git
161 plugin: dump
162@@ -57,7 +57,7 @@ parts:
163 - "-layers"
164 interface-nrpe-external-master:
165 source: https://github.com/canonical-ols/nrpe-external-master-interface
166- source-commit: "20b2b9fb80613997cb99b8096040cbba72a0ef0c"
167+ source-commit: "3a195bf592c6b45a58fce0d398ba6921dd0bae3b"
168 source-submodules: []
169 source-type: git
170 plugin: dump
171@@ -69,7 +69,7 @@ parts:
172 - "-layers"
173 layer-apt:
174 source: https://git.launchpad.net/layer-apt
175- source-commit: "cf78622e68fe1ca97eb8993c5adc2616f9e110b9"
176+ source-commit: "76bddfb640ab8767fc7e4a4b73a4a4e781948f34"
177 source-submodules: []
178 source-type: git
179 plugin: dump
180@@ -81,7 +81,7 @@ parts:
181 - "-layers"
182 layer-basic:
183 source: https://github.com/juju-solutions/layer-basic
184- source-commit: "baf582236a7b946da4cd140fd6532a2e0c2774d5"
185+ source-commit: "e3affe74ff0c33e2fbfc560fcd1d873726c40233"
186 source-submodules: []
187 source-type: git
188 plugin: dump
189@@ -105,7 +105,7 @@ parts:
190 - "-layers"
191 layer-status:
192 source: https://github.com/juju-solutions/layer-status
193- source-commit: "02658f0f6b2d29316b79820b206cec532c0459c8"
194+ source-commit: "a7d7b6423db37a47611310039e6ed1929c0a2eab"
195 source-submodules: []
196 source-type: git
197 plugin: dump
198@@ -117,7 +117,7 @@ parts:
199 - "-layers"
200 launchpad-layers:
201 source: https://git.launchpad.net/launchpad-layers
202- source-commit: "466a8348106b0a14e4c1cf18fbafe13d1f927bad"
203+ source-commit: "300b0d9fd332c055395fe209512335cea03c7af3"
204 source-submodules: []
205 source-type: git
206 plugin: dump
207@@ -143,6 +143,7 @@ parts:
208 source: .
209 plugin: reactive
210 build-snaps: [charm]
211+ build-packages: [python3-dev]
212 build-environment:
213 - CHARM_LAYERS_DIR: $CRAFT_STAGE/layers/layer
214 - CHARM_INTERFACES_DIR: $CRAFT_STAGE/layers/interface
215diff --git a/charm/turnip-celery/metadata.yaml b/charm/turnip-celery/metadata.yaml
216index 5105848..7b0ac47 100644
217--- a/charm/turnip-celery/metadata.yaml
218+++ b/charm/turnip-celery/metadata.yaml
219@@ -10,6 +10,7 @@ tags:
220 - network
221 - web_server
222 series:
223+ - focal
224 - bionic
225 - xenial
226 subordinate: false
227diff --git a/charm/turnip-pack-backend/charmcraft.yaml b/charm/turnip-pack-backend/charmcraft.yaml
228index 8013285..4a0a48c 100644
229--- a/charm/turnip-pack-backend/charmcraft.yaml
230+++ b/charm/turnip-pack-backend/charmcraft.yaml
231@@ -2,16 +2,16 @@ type: charm
232 bases:
233 - build-on:
234 - name: ubuntu
235- channel: "18.04"
236+ channel: "20.04"
237 architectures: [amd64]
238 run-on:
239 - name: ubuntu
240- channel: "18.04"
241+ channel: "20.04"
242 architectures: [amd64]
243 parts:
244 charm-wheels:
245- source: https://git.launchpad.net/~canonical-launchpad-branches/turnip/+git/dependencies
246- source-commit: "030fe3e51edfe8e8c8b3590b52c4792b21631f01"
247+ source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
248+ source-commit: "7bcd79fa4fca485eaf15ee9e2ee16f3ab902678d"
249 source-submodules: []
250 source-type: git
251 plugin: dump
252@@ -21,7 +21,7 @@ parts:
253 - "-charm-wheels"
254 interface-rabbitmq:
255 source: https://github.com/openstack/charm-interface-rabbitmq
256- source-commit: "571f4864c2f942d92991b3f413323a04c6f56d72"
257+ source-commit: "383121fc584d2d3bf9d233eba0d3708398a4c468"
258 source-submodules: []
259 source-type: git
260 plugin: dump
261@@ -33,7 +33,7 @@ parts:
262 - "-layers"
263 interface-http:
264 source: https://github.com/juju-solutions/interface-http
265- source-commit: "4a232c6998a0c7deac0c2362e7a9a4f1c776603b"
266+ source-commit: "632131b1f122daf6fb601fd4c9f1e4dbb1a92e09"
267 source-submodules: []
268 source-type: git
269 plugin: dump
270@@ -57,7 +57,7 @@ parts:
271 - "-layers"
272 interface-nrpe-external-master:
273 source: https://github.com/canonical-ols/nrpe-external-master-interface
274- source-commit: "20b2b9fb80613997cb99b8096040cbba72a0ef0c"
275+ source-commit: "3a195bf592c6b45a58fce0d398ba6921dd0bae3b"
276 source-submodules: []
277 source-type: git
278 plugin: dump
279@@ -69,7 +69,7 @@ parts:
280 - "-layers"
281 layer-apt:
282 source: https://git.launchpad.net/layer-apt
283- source-commit: "cf78622e68fe1ca97eb8993c5adc2616f9e110b9"
284+ source-commit: "76bddfb640ab8767fc7e4a4b73a4a4e781948f34"
285 source-submodules: []
286 source-type: git
287 plugin: dump
288@@ -81,7 +81,7 @@ parts:
289 - "-layers"
290 layer-basic:
291 source: https://github.com/juju-solutions/layer-basic
292- source-commit: "baf582236a7b946da4cd140fd6532a2e0c2774d5"
293+ source-commit: "e3affe74ff0c33e2fbfc560fcd1d873726c40233"
294 source-submodules: []
295 source-type: git
296 plugin: dump
297@@ -105,7 +105,7 @@ parts:
298 - "-layers"
299 layer-status:
300 source: https://github.com/juju-solutions/layer-status
301- source-commit: "02658f0f6b2d29316b79820b206cec532c0459c8"
302+ source-commit: "a7d7b6423db37a47611310039e6ed1929c0a2eab"
303 source-submodules: []
304 source-type: git
305 plugin: dump
306@@ -117,7 +117,7 @@ parts:
307 - "-layers"
308 launchpad-layers:
309 source: https://git.launchpad.net/launchpad-layers
310- source-commit: "466a8348106b0a14e4c1cf18fbafe13d1f927bad"
311+ source-commit: "300b0d9fd332c055395fe209512335cea03c7af3"
312 source-submodules: []
313 source-type: git
314 plugin: dump
315@@ -143,6 +143,7 @@ parts:
316 source: .
317 plugin: reactive
318 build-snaps: [charm]
319+ build-packages: [python3-dev]
320 build-environment:
321 - CHARM_LAYERS_DIR: $CRAFT_STAGE/layers/layer
322 - CHARM_INTERFACES_DIR: $CRAFT_STAGE/layers/interface
323diff --git a/charm/turnip-pack-backend/metadata.yaml b/charm/turnip-pack-backend/metadata.yaml
324index 5ea4786..a4989bf 100644
325--- a/charm/turnip-pack-backend/metadata.yaml
326+++ b/charm/turnip-pack-backend/metadata.yaml
327@@ -10,6 +10,7 @@ tags:
328 # https://docs.jujucharms.com/devel/en/authors-charm-metadata#charm-store-fields
329 - network
330 series:
331+ - focal
332 - bionic
333 - xenial
334 subordinate: false
335diff --git a/charm/turnip-pack-frontend-git/charmcraft.yaml b/charm/turnip-pack-frontend-git/charmcraft.yaml
336index 45964f9..683c01a 100644
337--- a/charm/turnip-pack-frontend-git/charmcraft.yaml
338+++ b/charm/turnip-pack-frontend-git/charmcraft.yaml
339@@ -2,16 +2,16 @@ type: charm
340 bases:
341 - build-on:
342 - name: ubuntu
343- channel: "18.04"
344+ channel: "20.04"
345 architectures: [amd64]
346 run-on:
347 - name: ubuntu
348- channel: "18.04"
349+ channel: "20.04"
350 architectures: [amd64]
351 parts:
352 charm-wheels:
353- source: https://git.launchpad.net/~canonical-launchpad-branches/turnip/+git/dependencies
354- source-commit: "030fe3e51edfe8e8c8b3590b52c4792b21631f01"
355+ source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
356+ source-commit: "7bcd79fa4fca485eaf15ee9e2ee16f3ab902678d"
357 source-submodules: []
358 source-type: git
359 plugin: dump
360@@ -21,7 +21,7 @@ parts:
361 - "-charm-wheels"
362 interface-rabbitmq:
363 source: https://github.com/openstack/charm-interface-rabbitmq
364- source-commit: "571f4864c2f942d92991b3f413323a04c6f56d72"
365+ source-commit: "383121fc584d2d3bf9d233eba0d3708398a4c468"
366 source-submodules: []
367 source-type: git
368 plugin: dump
369@@ -33,7 +33,7 @@ parts:
370 - "-layers"
371 interface-http:
372 source: https://github.com/juju-solutions/interface-http
373- source-commit: "4a232c6998a0c7deac0c2362e7a9a4f1c776603b"
374+ source-commit: "632131b1f122daf6fb601fd4c9f1e4dbb1a92e09"
375 source-submodules: []
376 source-type: git
377 plugin: dump
378@@ -57,7 +57,7 @@ parts:
379 - "-layers"
380 interface-nrpe-external-master:
381 source: https://github.com/canonical-ols/nrpe-external-master-interface
382- source-commit: "20b2b9fb80613997cb99b8096040cbba72a0ef0c"
383+ source-commit: "3a195bf592c6b45a58fce0d398ba6921dd0bae3b"
384 source-submodules: []
385 source-type: git
386 plugin: dump
387@@ -69,7 +69,7 @@ parts:
388 - "-layers"
389 layer-apt:
390 source: https://git.launchpad.net/layer-apt
391- source-commit: "cf78622e68fe1ca97eb8993c5adc2616f9e110b9"
392+ source-commit: "76bddfb640ab8767fc7e4a4b73a4a4e781948f34"
393 source-submodules: []
394 source-type: git
395 plugin: dump
396@@ -81,7 +81,7 @@ parts:
397 - "-layers"
398 layer-basic:
399 source: https://github.com/juju-solutions/layer-basic
400- source-commit: "baf582236a7b946da4cd140fd6532a2e0c2774d5"
401+ source-commit: "e3affe74ff0c33e2fbfc560fcd1d873726c40233"
402 source-submodules: []
403 source-type: git
404 plugin: dump
405@@ -105,7 +105,7 @@ parts:
406 - "-layers"
407 layer-status:
408 source: https://github.com/juju-solutions/layer-status
409- source-commit: "02658f0f6b2d29316b79820b206cec532c0459c8"
410+ source-commit: "a7d7b6423db37a47611310039e6ed1929c0a2eab"
411 source-submodules: []
412 source-type: git
413 plugin: dump
414@@ -117,7 +117,7 @@ parts:
415 - "-layers"
416 launchpad-layers:
417 source: https://git.launchpad.net/launchpad-layers
418- source-commit: "466a8348106b0a14e4c1cf18fbafe13d1f927bad"
419+ source-commit: "300b0d9fd332c055395fe209512335cea03c7af3"
420 source-submodules: []
421 source-type: git
422 plugin: dump
423@@ -142,6 +142,7 @@ parts:
424 source: .
425 plugin: reactive
426 build-snaps: [charm]
427+ build-packages: [python3-dev]
428 build-environment:
429 - CHARM_LAYERS_DIR: $CRAFT_STAGE/layers/layer
430 - CHARM_INTERFACES_DIR: $CRAFT_STAGE/layers/interface
431diff --git a/charm/turnip-pack-frontend-git/metadata.yaml b/charm/turnip-pack-frontend-git/metadata.yaml
432index e885b37..eca806a 100644
433--- a/charm/turnip-pack-frontend-git/metadata.yaml
434+++ b/charm/turnip-pack-frontend-git/metadata.yaml
435@@ -10,6 +10,7 @@ tags:
436 # https://docs.jujucharms.com/devel/en/authors-charm-metadata#charm-store-fields
437 - network
438 series:
439+ - focal
440 - bionic
441 - xenial
442 subordinate: false
443diff --git a/charm/turnip-pack-frontend-http/charmcraft.yaml b/charm/turnip-pack-frontend-http/charmcraft.yaml
444index 0ce1f3c..7dcd129 100644
445--- a/charm/turnip-pack-frontend-http/charmcraft.yaml
446+++ b/charm/turnip-pack-frontend-http/charmcraft.yaml
447@@ -2,16 +2,16 @@ type: charm
448 bases:
449 - build-on:
450 - name: ubuntu
451- channel: "18.04"
452+ channel: "20.04"
453 architectures: [amd64]
454 run-on:
455 - name: ubuntu
456- channel: "18.04"
457+ channel: "20.04"
458 architectures: [amd64]
459 parts:
460 charm-wheels:
461- source: https://git.launchpad.net/~canonical-launchpad-branches/turnip/+git/dependencies
462- source-commit: "030fe3e51edfe8e8c8b3590b52c4792b21631f01"
463+ source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
464+ source-commit: "7bcd79fa4fca485eaf15ee9e2ee16f3ab902678d"
465 source-submodules: []
466 source-type: git
467 plugin: dump
468@@ -21,7 +21,7 @@ parts:
469 - "-charm-wheels"
470 interface-rabbitmq:
471 source: https://github.com/openstack/charm-interface-rabbitmq
472- source-commit: "571f4864c2f942d92991b3f413323a04c6f56d72"
473+ source-commit: "383121fc584d2d3bf9d233eba0d3708398a4c468"
474 source-submodules: []
475 source-type: git
476 plugin: dump
477@@ -33,7 +33,7 @@ parts:
478 - "-layers"
479 interface-http:
480 source: https://github.com/juju-solutions/interface-http
481- source-commit: "4a232c6998a0c7deac0c2362e7a9a4f1c776603b"
482+ source-commit: "632131b1f122daf6fb601fd4c9f1e4dbb1a92e09"
483 source-submodules: []
484 source-type: git
485 plugin: dump
486@@ -57,7 +57,7 @@ parts:
487 - "-layers"
488 interface-nrpe-external-master:
489 source: https://github.com/canonical-ols/nrpe-external-master-interface
490- source-commit: "20b2b9fb80613997cb99b8096040cbba72a0ef0c"
491+ source-commit: "3a195bf592c6b45a58fce0d398ba6921dd0bae3b"
492 source-submodules: []
493 source-type: git
494 plugin: dump
495@@ -69,7 +69,7 @@ parts:
496 - "-layers"
497 layer-apt:
498 source: https://git.launchpad.net/layer-apt
499- source-commit: "cf78622e68fe1ca97eb8993c5adc2616f9e110b9"
500+ source-commit: "76bddfb640ab8767fc7e4a4b73a4a4e781948f34"
501 source-submodules: []
502 source-type: git
503 plugin: dump
504@@ -81,7 +81,7 @@ parts:
505 - "-layers"
506 layer-basic:
507 source: https://github.com/juju-solutions/layer-basic
508- source-commit: "baf582236a7b946da4cd140fd6532a2e0c2774d5"
509+ source-commit: "e3affe74ff0c33e2fbfc560fcd1d873726c40233"
510 source-submodules: []
511 source-type: git
512 plugin: dump
513@@ -105,7 +105,7 @@ parts:
514 - "-layers"
515 layer-status:
516 source: https://github.com/juju-solutions/layer-status
517- source-commit: "02658f0f6b2d29316b79820b206cec532c0459c8"
518+ source-commit: "a7d7b6423db37a47611310039e6ed1929c0a2eab"
519 source-submodules: []
520 source-type: git
521 plugin: dump
522@@ -117,7 +117,7 @@ parts:
523 - "-layers"
524 launchpad-layers:
525 source: https://git.launchpad.net/launchpad-layers
526- source-commit: "466a8348106b0a14e4c1cf18fbafe13d1f927bad"
527+ source-commit: "300b0d9fd332c055395fe209512335cea03c7af3"
528 source-submodules: []
529 source-type: git
530 plugin: dump
531@@ -143,6 +143,7 @@ parts:
532 source: .
533 plugin: reactive
534 build-snaps: [charm]
535+ build-packages: [python3-dev]
536 build-environment:
537 - CHARM_LAYERS_DIR: $CRAFT_STAGE/layers/layer
538 - CHARM_INTERFACES_DIR: $CRAFT_STAGE/layers/interface
539diff --git a/charm/turnip-pack-frontend-http/metadata.yaml b/charm/turnip-pack-frontend-http/metadata.yaml
540index a12f341..14ac9b9 100644
541--- a/charm/turnip-pack-frontend-http/metadata.yaml
542+++ b/charm/turnip-pack-frontend-http/metadata.yaml
543@@ -11,6 +11,7 @@ tags:
544 - network
545 - web_server
546 series:
547+ - focal
548 - bionic
549 - xenial
550 subordinate: false
551diff --git a/charm/turnip-pack-frontend-ssh/charmcraft.yaml b/charm/turnip-pack-frontend-ssh/charmcraft.yaml
552index 26a191e..41afd55 100644
553--- a/charm/turnip-pack-frontend-ssh/charmcraft.yaml
554+++ b/charm/turnip-pack-frontend-ssh/charmcraft.yaml
555@@ -2,16 +2,16 @@ type: charm
556 bases:
557 - build-on:
558 - name: ubuntu
559- channel: "18.04"
560+ channel: "20.04"
561 architectures: [amd64]
562 run-on:
563 - name: ubuntu
564- channel: "18.04"
565+ channel: "20.04"
566 architectures: [amd64]
567 parts:
568 charm-wheels:
569- source: https://git.launchpad.net/~canonical-launchpad-branches/turnip/+git/dependencies
570- source-commit: "030fe3e51edfe8e8c8b3590b52c4792b21631f01"
571+ source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
572+ source-commit: "7bcd79fa4fca485eaf15ee9e2ee16f3ab902678d"
573 source-submodules: []
574 source-type: git
575 plugin: dump
576@@ -21,7 +21,7 @@ parts:
577 - "-charm-wheels"
578 interface-rabbitmq:
579 source: https://github.com/openstack/charm-interface-rabbitmq
580- source-commit: "571f4864c2f942d92991b3f413323a04c6f56d72"
581+ source-commit: "383121fc584d2d3bf9d233eba0d3708398a4c468"
582 source-submodules: []
583 source-type: git
584 plugin: dump
585@@ -33,7 +33,7 @@ parts:
586 - "-layers"
587 interface-http:
588 source: https://github.com/juju-solutions/interface-http
589- source-commit: "4a232c6998a0c7deac0c2362e7a9a4f1c776603b"
590+ source-commit: "632131b1f122daf6fb601fd4c9f1e4dbb1a92e09"
591 source-submodules: []
592 source-type: git
593 plugin: dump
594@@ -57,7 +57,7 @@ parts:
595 - "-layers"
596 interface-nrpe-external-master:
597 source: https://github.com/canonical-ols/nrpe-external-master-interface
598- source-commit: "20b2b9fb80613997cb99b8096040cbba72a0ef0c"
599+ source-commit: "3a195bf592c6b45a58fce0d398ba6921dd0bae3b"
600 source-submodules: []
601 source-type: git
602 plugin: dump
603@@ -69,7 +69,7 @@ parts:
604 - "-layers"
605 layer-apt:
606 source: https://git.launchpad.net/layer-apt
607- source-commit: "cf78622e68fe1ca97eb8993c5adc2616f9e110b9"
608+ source-commit: "76bddfb640ab8767fc7e4a4b73a4a4e781948f34"
609 source-submodules: []
610 source-type: git
611 plugin: dump
612@@ -81,7 +81,7 @@ parts:
613 - "-layers"
614 layer-basic:
615 source: https://github.com/juju-solutions/layer-basic
616- source-commit: "baf582236a7b946da4cd140fd6532a2e0c2774d5"
617+ source-commit: "e3affe74ff0c33e2fbfc560fcd1d873726c40233"
618 source-submodules: []
619 source-type: git
620 plugin: dump
621@@ -105,7 +105,7 @@ parts:
622 - "-layers"
623 layer-status:
624 source: https://github.com/juju-solutions/layer-status
625- source-commit: "02658f0f6b2d29316b79820b206cec532c0459c8"
626+ source-commit: "a7d7b6423db37a47611310039e6ed1929c0a2eab"
627 source-submodules: []
628 source-type: git
629 plugin: dump
630@@ -117,7 +117,7 @@ parts:
631 - "-layers"
632 launchpad-layers:
633 source: https://git.launchpad.net/launchpad-layers
634- source-commit: "466a8348106b0a14e4c1cf18fbafe13d1f927bad"
635+ source-commit: "300b0d9fd332c055395fe209512335cea03c7af3"
636 source-submodules: []
637 source-type: git
638 plugin: dump
639@@ -142,6 +142,7 @@ parts:
640 source: .
641 plugin: reactive
642 build-snaps: [charm]
643+ build-packages: [python3-dev]
644 build-environment:
645 - CHARM_LAYERS_DIR: $CRAFT_STAGE/layers/layer
646 - CHARM_INTERFACES_DIR: $CRAFT_STAGE/layers/interface
647diff --git a/charm/turnip-pack-frontend-ssh/metadata.yaml b/charm/turnip-pack-frontend-ssh/metadata.yaml
648index 171fed2..89c5393 100644
649--- a/charm/turnip-pack-frontend-ssh/metadata.yaml
650+++ b/charm/turnip-pack-frontend-ssh/metadata.yaml
651@@ -10,6 +10,7 @@ tags:
652 # https://docs.jujucharms.com/devel/en/authors-charm-metadata#charm-store-fields
653 - network
654 series:
655+ - focal
656 - bionic
657 - xenial
658 subordinate: false
659diff --git a/charm/turnip-pack-virt/charmcraft.yaml b/charm/turnip-pack-virt/charmcraft.yaml
660index b171f15..dca1aab 100644
661--- a/charm/turnip-pack-virt/charmcraft.yaml
662+++ b/charm/turnip-pack-virt/charmcraft.yaml
663@@ -2,16 +2,16 @@ type: charm
664 bases:
665 - build-on:
666 - name: ubuntu
667- channel: "18.04"
668+ channel: "20.04"
669 architectures: [amd64]
670 run-on:
671 - name: ubuntu
672- channel: "18.04"
673+ channel: "20.04"
674 architectures: [amd64]
675 parts:
676 charm-wheels:
677- source: https://git.launchpad.net/~canonical-launchpad-branches/turnip/+git/dependencies
678- source-commit: "030fe3e51edfe8e8c8b3590b52c4792b21631f01"
679+ source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
680+ source-commit: "7bcd79fa4fca485eaf15ee9e2ee16f3ab902678d"
681 source-submodules: []
682 source-type: git
683 plugin: dump
684@@ -21,7 +21,7 @@ parts:
685 - "-charm-wheels"
686 interface-rabbitmq:
687 source: https://github.com/openstack/charm-interface-rabbitmq
688- source-commit: "571f4864c2f942d92991b3f413323a04c6f56d72"
689+ source-commit: "383121fc584d2d3bf9d233eba0d3708398a4c468"
690 source-submodules: []
691 source-type: git
692 plugin: dump
693@@ -33,7 +33,7 @@ parts:
694 - "-layers"
695 interface-http:
696 source: https://github.com/juju-solutions/interface-http
697- source-commit: "4a232c6998a0c7deac0c2362e7a9a4f1c776603b"
698+ source-commit: "632131b1f122daf6fb601fd4c9f1e4dbb1a92e09"
699 source-submodules: []
700 source-type: git
701 plugin: dump
702@@ -57,7 +57,7 @@ parts:
703 - "-layers"
704 interface-nrpe-external-master:
705 source: https://github.com/canonical-ols/nrpe-external-master-interface
706- source-commit: "20b2b9fb80613997cb99b8096040cbba72a0ef0c"
707+ source-commit: "3a195bf592c6b45a58fce0d398ba6921dd0bae3b"
708 source-submodules: []
709 source-type: git
710 plugin: dump
711@@ -69,7 +69,7 @@ parts:
712 - "-layers"
713 layer-apt:
714 source: https://git.launchpad.net/layer-apt
715- source-commit: "cf78622e68fe1ca97eb8993c5adc2616f9e110b9"
716+ source-commit: "76bddfb640ab8767fc7e4a4b73a4a4e781948f34"
717 source-submodules: []
718 source-type: git
719 plugin: dump
720@@ -81,7 +81,7 @@ parts:
721 - "-layers"
722 layer-basic:
723 source: https://github.com/juju-solutions/layer-basic
724- source-commit: "baf582236a7b946da4cd140fd6532a2e0c2774d5"
725+ source-commit: "e3affe74ff0c33e2fbfc560fcd1d873726c40233"
726 source-submodules: []
727 source-type: git
728 plugin: dump
729@@ -105,7 +105,7 @@ parts:
730 - "-layers"
731 layer-status:
732 source: https://github.com/juju-solutions/layer-status
733- source-commit: "02658f0f6b2d29316b79820b206cec532c0459c8"
734+ source-commit: "a7d7b6423db37a47611310039e6ed1929c0a2eab"
735 source-submodules: []
736 source-type: git
737 plugin: dump
738@@ -117,7 +117,7 @@ parts:
739 - "-layers"
740 launchpad-layers:
741 source: https://git.launchpad.net/launchpad-layers
742- source-commit: "466a8348106b0a14e4c1cf18fbafe13d1f927bad"
743+ source-commit: "300b0d9fd332c055395fe209512335cea03c7af3"
744 source-submodules: []
745 source-type: git
746 plugin: dump
747@@ -142,6 +142,7 @@ parts:
748 source: .
749 plugin: reactive
750 build-snaps: [charm]
751+ build-packages: [python3-dev]
752 build-environment:
753 - CHARM_LAYERS_DIR: $CRAFT_STAGE/layers/layer
754 - CHARM_INTERFACES_DIR: $CRAFT_STAGE/layers/interface
755diff --git a/charm/turnip-pack-virt/metadata.yaml b/charm/turnip-pack-virt/metadata.yaml
756index 463b5e7..95c24f7 100644
757--- a/charm/turnip-pack-virt/metadata.yaml
758+++ b/charm/turnip-pack-virt/metadata.yaml
759@@ -10,6 +10,7 @@ tags:
760 # https://docs.jujucharms.com/devel/en/authors-charm-metadata#charm-store-fields
761 - network
762 series:
763+ - focal
764 - bionic
765 - xenial
766 subordinate: false

Subscribers

People subscribed via source and target branches