Launchpad itself

Merge ~cjwatson/launchpad:charm-bump-ols-layers into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. charm-bump-ols-layers
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 1099f303dcdbd338f3c81f983a5b5f0f42923c48
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:charm-bump-ols-layers
Merge into: launchpad:master
Diff against target: 214 lines (+29/-23)
6 files modified
charm/launchpad-admin/charmcraft.yaml (+5/-4)
charm/launchpad-appserver/charmcraft.yaml (+5/-4)
charm/launchpad-assets/charmcraft.yaml (+4/-3)
charm/launchpad-debian-importer/charmcraft.yaml (+5/-4)
charm/launchpad-librarian/charmcraft.yaml (+5/-4)
charm/launchpad/charmcraft.yaml (+5/-4)
Reviewer Review Type Date Requested Status
Guruprasad Approve
Review via email: mp+444301@code.launchpad.net

Commit message

charm: Update ols-layers

Description of the change

This pulls in a number of improvements. The most relevant ones are:

  f157081b16 Remove libpq-dev, python-dev, gcc from the ols-pg packages

In combination with some changes to `build-snaps`, `build-packages`, and `reactive-charm-build-arguments` in our `charmcraft.yaml` files, this allows us to build charms that contain wheels rather than sdists in their `wheelhouse` directory for dependencies of charm code itself, and to drop the requirement for the above packages to be installed in most of our deployed machines; this makes all our charms be a bit faster to deploy and use a little less disk space.

  39c38b1f12 Add tarball_payload_name layer option for multi-charm services

This was my motivation for this update; I wanted to make `launchpad-assets` use the `ols-http` layer for `haproxy` integration, but ran into the `service_name` layer option being used for both deciding which artifact to download from Swift and naming the `haproxy` frontend. This change will let us decouple those two things.

To post a comment you must log in.
Revision history for this message
Guruprasad (lgp171188) wrote :

LGTM 👍

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charm/launchpad-admin/charmcraft.yaml b/charm/launchpad-admin/charmcraft.yaml
2index c27c604..1a4c291 100644
3--- a/charm/launchpad-admin/charmcraft.yaml
4+++ b/charm/launchpad-admin/charmcraft.yaml
5@@ -11,7 +11,7 @@ bases:
6 parts:
7 charm-wheels:
8 source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
9- source-commit: "59b32ae07f98051385c96d6d8e7e02ca4f197fe5"
10+ source-commit: "42c89d9c66dbe137139b047fd54aed49b66d1a5e"
11 source-submodules: []
12 source-type: git
13 plugin: dump
14@@ -21,7 +21,7 @@ parts:
15 - "-charm-wheels"
16 ols-layers:
17 source: https://git.launchpad.net/ols-charm-deps
18- source-commit: "56d219f60a293a6c73759b8439ef5fdb11e19d1f"
19+ source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
20 source-submodules: []
21 source-type: git
22 plugin: dump
23@@ -53,10 +53,11 @@ parts:
24 - launchpad-layers
25 source: .
26 plugin: reactive
27- build-snaps: [charm/2.x/stable]
28- build-packages: [libpq-dev]
29+ build-snaps: [charm]
30+ build-packages: [libpq-dev, python3-dev]
31 build-environment:
32 - CHARM_LAYERS_DIR: $CRAFT_STAGE/layers/layer
33 - CHARM_INTERFACES_DIR: $CRAFT_STAGE/layers/interface
34 - PIP_NO_INDEX: "true"
35 - PIP_FIND_LINKS: $CRAFT_STAGE/charm-wheels
36+ reactive-charm-build-arguments: [--binary-wheels-from-source]
37diff --git a/charm/launchpad-appserver/charmcraft.yaml b/charm/launchpad-appserver/charmcraft.yaml
38index 5e7f772..b703e17 100644
39--- a/charm/launchpad-appserver/charmcraft.yaml
40+++ b/charm/launchpad-appserver/charmcraft.yaml
41@@ -11,7 +11,7 @@ bases:
42 parts:
43 charm-wheels:
44 source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
45- source-commit: "59b32ae07f98051385c96d6d8e7e02ca4f197fe5"
46+ source-commit: "42c89d9c66dbe137139b047fd54aed49b66d1a5e"
47 source-submodules: []
48 source-type: git
49 plugin: dump
50@@ -21,7 +21,7 @@ parts:
51 - "-charm-wheels"
52 ols-layers:
53 source: https://git.launchpad.net/ols-charm-deps
54- source-commit: "56d219f60a293a6c73759b8439ef5fdb11e19d1f"
55+ source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
56 source-submodules: []
57 source-type: git
58 plugin: dump
59@@ -66,10 +66,11 @@ parts:
60 - layer-coordinator
61 source: .
62 plugin: reactive
63- build-snaps: [charm/2.x/stable]
64- build-packages: [libpq-dev]
65+ build-snaps: [charm]
66+ build-packages: [libpq-dev, python3-dev]
67 build-environment:
68 - CHARM_LAYERS_DIR: $CRAFT_STAGE/layers/layer
69 - CHARM_INTERFACES_DIR: $CRAFT_STAGE/layers/interface
70 - PIP_NO_INDEX: "true"
71 - PIP_FIND_LINKS: $CRAFT_STAGE/charm-wheels
72+ reactive-charm-build-arguments: [--binary-wheels-from-source]
73diff --git a/charm/launchpad-assets/charmcraft.yaml b/charm/launchpad-assets/charmcraft.yaml
74index c3b7cf8..0651a45 100644
75--- a/charm/launchpad-assets/charmcraft.yaml
76+++ b/charm/launchpad-assets/charmcraft.yaml
77@@ -11,7 +11,7 @@ bases:
78 parts:
79 charm-wheels:
80 source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
81- source-commit: "59b32ae07f98051385c96d6d8e7e02ca4f197fe5"
82+ source-commit: "42c89d9c66dbe137139b047fd54aed49b66d1a5e"
83 source-submodules: []
84 source-type: git
85 plugin: dump
86@@ -21,7 +21,7 @@ parts:
87 - "-charm-wheels"
88 ols-layers:
89 source: https://git.launchpad.net/ols-charm-deps
90- source-commit: "56d219f60a293a6c73759b8439ef5fdb11e19d1f"
91+ source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
92 source-submodules: []
93 source-type: git
94 plugin: dump
95@@ -64,9 +64,10 @@ parts:
96 - interface-apache-website
97 source: .
98 plugin: reactive
99- build-snaps: [charm/2.x/stable]
100+ build-snaps: [charm]
101 build-environment:
102 - CHARM_LAYERS_DIR: $CRAFT_STAGE/layers/layer
103 - CHARM_INTERFACES_DIR: $CRAFT_STAGE/layers/interface
104 - PIP_NO_INDEX: "true"
105 - PIP_FIND_LINKS: $CRAFT_STAGE/charm-wheels
106+ reactive-charm-build-arguments: [--binary-wheels-from-source]
107diff --git a/charm/launchpad-debian-importer/charmcraft.yaml b/charm/launchpad-debian-importer/charmcraft.yaml
108index 01134d6..8dd4abb 100644
109--- a/charm/launchpad-debian-importer/charmcraft.yaml
110+++ b/charm/launchpad-debian-importer/charmcraft.yaml
111@@ -11,7 +11,7 @@ bases:
112 parts:
113 charm-wheels:
114 source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
115- source-commit: "59b32ae07f98051385c96d6d8e7e02ca4f197fe5"
116+ source-commit: "42c89d9c66dbe137139b047fd54aed49b66d1a5e"
117 source-submodules: []
118 source-type: git
119 plugin: dump
120@@ -21,7 +21,7 @@ parts:
121 - "-charm-wheels"
122 ols-layers:
123 source: https://git.launchpad.net/ols-charm-deps
124- source-commit: "56d219f60a293a6c73759b8439ef5fdb11e19d1f"
125+ source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
126 source-submodules: []
127 source-type: git
128 plugin: dump
129@@ -53,10 +53,11 @@ parts:
130 - launchpad-layers
131 source: .
132 plugin: reactive
133- build-snaps: [charm/2.x/stable]
134- build-packages: [libpq-dev]
135+ build-snaps: [charm]
136+ build-packages: [libpq-dev, python3-dev]
137 build-environment:
138 - CHARM_LAYERS_DIR: $CRAFT_STAGE/layers/layer
139 - CHARM_INTERFACES_DIR: $CRAFT_STAGE/layers/interface
140 - PIP_NO_INDEX: "true"
141 - PIP_FIND_LINKS: $CRAFT_STAGE/charm-wheels
142+ reactive-charm-build-arguments: [--binary-wheels-from-source]
143diff --git a/charm/launchpad-librarian/charmcraft.yaml b/charm/launchpad-librarian/charmcraft.yaml
144index 07b75c0..77e67e8 100644
145--- a/charm/launchpad-librarian/charmcraft.yaml
146+++ b/charm/launchpad-librarian/charmcraft.yaml
147@@ -11,7 +11,7 @@ bases:
148 parts:
149 charm-wheels:
150 source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
151- source-commit: "59b32ae07f98051385c96d6d8e7e02ca4f197fe5"
152+ source-commit: "42c89d9c66dbe137139b047fd54aed49b66d1a5e"
153 source-submodules: []
154 source-type: git
155 plugin: dump
156@@ -21,7 +21,7 @@ parts:
157 - "-charm-wheels"
158 ols-layers:
159 source: https://git.launchpad.net/ols-charm-deps
160- source-commit: "56d219f60a293a6c73759b8439ef5fdb11e19d1f"
161+ source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
162 source-submodules: []
163 source-type: git
164 plugin: dump
165@@ -53,10 +53,11 @@ parts:
166 - launchpad-layers
167 source: .
168 plugin: reactive
169- build-snaps: [charm/2.x/stable]
170- build-packages: [libpq-dev]
171+ build-snaps: [charm]
172+ build-packages: [libpq-dev, python3-dev]
173 build-environment:
174 - CHARM_LAYERS_DIR: $CRAFT_STAGE/layers/layer
175 - CHARM_INTERFACES_DIR: $CRAFT_STAGE/layers/interface
176 - PIP_NO_INDEX: "true"
177 - PIP_FIND_LINKS: $CRAFT_STAGE/charm-wheels
178+ reactive-charm-build-arguments: [--binary-wheels-from-source]
179diff --git a/charm/launchpad/charmcraft.yaml b/charm/launchpad/charmcraft.yaml
180index e7ec243..f40eac4 100644
181--- a/charm/launchpad/charmcraft.yaml
182+++ b/charm/launchpad/charmcraft.yaml
183@@ -11,7 +11,7 @@ bases:
184 parts:
185 charm-wheels:
186 source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
187- source-commit: "59b32ae07f98051385c96d6d8e7e02ca4f197fe5"
188+ source-commit: "42c89d9c66dbe137139b047fd54aed49b66d1a5e"
189 source-submodules: []
190 source-type: git
191 plugin: dump
192@@ -21,7 +21,7 @@ parts:
193 - "-charm-wheels"
194 ols-layers:
195 source: https://git.launchpad.net/ols-charm-deps
196- source-commit: "56d219f60a293a6c73759b8439ef5fdb11e19d1f"
197+ source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
198 source-submodules: []
199 source-type: git
200 plugin: dump
201@@ -52,10 +52,11 @@ parts:
202 - launchpad-layers
203 source: .
204 plugin: reactive
205- build-snaps: [charm/2.x/stable]
206- build-packages: [libpq-dev]
207+ build-snaps: [charm]
208+ build-packages: [libpq-dev, python3-dev]
209 build-environment:
210 - CHARM_LAYERS_DIR: $CRAFT_STAGE/layers/layer
211 - CHARM_INTERFACES_DIR: $CRAFT_STAGE/layers/interface
212 - PIP_NO_INDEX: "true"
213 - PIP_FIND_LINKS: $CRAFT_STAGE/charm-wheels
214+ reactive-charm-build-arguments: [--binary-wheels-from-source]

Subscribers

People subscribed via source and target branches

to status/vote changes: