launchpad-reviewers team mailing list archive

[Colin Watson <mp+444301@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:charm-bump-ols-layers into launchpad:master.

Commit message:
charm: Update ols-layers

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/444301

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.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:charm-bump-ols-layers into launchpad:master.

diff --git a/charm/launchpad-admin/charmcraft.yaml b/charm/launchpad-admin/charmcraft.yaml
index c27c604..1a4c291 100644
--- a/charm/launchpad-admin/charmcraft.yaml
+++ b/charm/launchpad-admin/charmcraft.yaml
@@ -11,7 +11,7 @@ bases:
 parts:
   charm-wheels:
     source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
-    source-commit: "59b32ae07f98051385c96d6d8e7e02ca4f197fe5"
+    source-commit: "42c89d9c66dbe137139b047fd54aed49b66d1a5e"
     source-submodules: []
     source-type: git
     plugin: dump
@@ -21,7 +21,7 @@ parts:
       - "-charm-wheels"
   ols-layers:
     source: https://git.launchpad.net/ols-charm-deps
-    source-commit: "56d219f60a293a6c73759b8439ef5fdb11e19d1f"
+    source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
     source-submodules: []
     source-type: git
     plugin: dump
@@ -53,10 +53,11 @@ parts:
       - launchpad-layers
     source: .
     plugin: reactive
-    build-snaps: [charm/2.x/stable]
-    build-packages: [libpq-dev]
+    build-snaps: [charm]
+    build-packages: [libpq-dev, python3-dev]
     build-environment:
       - CHARM_LAYERS_DIR: $CRAFT_STAGE/layers/layer
       - CHARM_INTERFACES_DIR: $CRAFT_STAGE/layers/interface
       - PIP_NO_INDEX: "true"
       - PIP_FIND_LINKS: $CRAFT_STAGE/charm-wheels
+    reactive-charm-build-arguments: [--binary-wheels-from-source]
diff --git a/charm/launchpad-appserver/charmcraft.yaml b/charm/launchpad-appserver/charmcraft.yaml
index 5e7f772..b703e17 100644
--- a/charm/launchpad-appserver/charmcraft.yaml
+++ b/charm/launchpad-appserver/charmcraft.yaml
@@ -11,7 +11,7 @@ bases:
 parts:
   charm-wheels:
     source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
-    source-commit: "59b32ae07f98051385c96d6d8e7e02ca4f197fe5"
+    source-commit: "42c89d9c66dbe137139b047fd54aed49b66d1a5e"
     source-submodules: []
     source-type: git
     plugin: dump
@@ -21,7 +21,7 @@ parts:
       - "-charm-wheels"
   ols-layers:
     source: https://git.launchpad.net/ols-charm-deps
-    source-commit: "56d219f60a293a6c73759b8439ef5fdb11e19d1f"
+    source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
     source-submodules: []
     source-type: git
     plugin: dump
@@ -66,10 +66,11 @@ parts:
       - layer-coordinator
     source: .
     plugin: reactive
-    build-snaps: [charm/2.x/stable]
-    build-packages: [libpq-dev]
+    build-snaps: [charm]
+    build-packages: [libpq-dev, python3-dev]
     build-environment:
       - CHARM_LAYERS_DIR: $CRAFT_STAGE/layers/layer
       - CHARM_INTERFACES_DIR: $CRAFT_STAGE/layers/interface
       - PIP_NO_INDEX: "true"
       - PIP_FIND_LINKS: $CRAFT_STAGE/charm-wheels
+    reactive-charm-build-arguments: [--binary-wheels-from-source]
diff --git a/charm/launchpad-assets/charmcraft.yaml b/charm/launchpad-assets/charmcraft.yaml
index c3b7cf8..0651a45 100644
--- a/charm/launchpad-assets/charmcraft.yaml
+++ b/charm/launchpad-assets/charmcraft.yaml
@@ -11,7 +11,7 @@ bases:
 parts:
   charm-wheels:
     source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
-    source-commit: "59b32ae07f98051385c96d6d8e7e02ca4f197fe5"
+    source-commit: "42c89d9c66dbe137139b047fd54aed49b66d1a5e"
     source-submodules: []
     source-type: git
     plugin: dump
@@ -21,7 +21,7 @@ parts:
       - "-charm-wheels"
   ols-layers:
     source: https://git.launchpad.net/ols-charm-deps
-    source-commit: "56d219f60a293a6c73759b8439ef5fdb11e19d1f"
+    source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
     source-submodules: []
     source-type: git
     plugin: dump
@@ -64,9 +64,10 @@ parts:
       - interface-apache-website
     source: .
     plugin: reactive
-    build-snaps: [charm/2.x/stable]
+    build-snaps: [charm]
     build-environment:
       - CHARM_LAYERS_DIR: $CRAFT_STAGE/layers/layer
       - CHARM_INTERFACES_DIR: $CRAFT_STAGE/layers/interface
       - PIP_NO_INDEX: "true"
       - PIP_FIND_LINKS: $CRAFT_STAGE/charm-wheels
+    reactive-charm-build-arguments: [--binary-wheels-from-source]
diff --git a/charm/launchpad-debian-importer/charmcraft.yaml b/charm/launchpad-debian-importer/charmcraft.yaml
index 01134d6..8dd4abb 100644
--- a/charm/launchpad-debian-importer/charmcraft.yaml
+++ b/charm/launchpad-debian-importer/charmcraft.yaml
@@ -11,7 +11,7 @@ bases:
 parts:
   charm-wheels:
     source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
-    source-commit: "59b32ae07f98051385c96d6d8e7e02ca4f197fe5"
+    source-commit: "42c89d9c66dbe137139b047fd54aed49b66d1a5e"
     source-submodules: []
     source-type: git
     plugin: dump
@@ -21,7 +21,7 @@ parts:
       - "-charm-wheels"
   ols-layers:
     source: https://git.launchpad.net/ols-charm-deps
-    source-commit: "56d219f60a293a6c73759b8439ef5fdb11e19d1f"
+    source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
     source-submodules: []
     source-type: git
     plugin: dump
@@ -53,10 +53,11 @@ parts:
       - launchpad-layers
     source: .
     plugin: reactive
-    build-snaps: [charm/2.x/stable]
-    build-packages: [libpq-dev]
+    build-snaps: [charm]
+    build-packages: [libpq-dev, python3-dev]
     build-environment:
       - CHARM_LAYERS_DIR: $CRAFT_STAGE/layers/layer
       - CHARM_INTERFACES_DIR: $CRAFT_STAGE/layers/interface
       - PIP_NO_INDEX: "true"
       - PIP_FIND_LINKS: $CRAFT_STAGE/charm-wheels
+    reactive-charm-build-arguments: [--binary-wheels-from-source]
diff --git a/charm/launchpad-librarian/charmcraft.yaml b/charm/launchpad-librarian/charmcraft.yaml
index 07b75c0..77e67e8 100644
--- a/charm/launchpad-librarian/charmcraft.yaml
+++ b/charm/launchpad-librarian/charmcraft.yaml
@@ -11,7 +11,7 @@ bases:
 parts:
   charm-wheels:
     source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
-    source-commit: "59b32ae07f98051385c96d6d8e7e02ca4f197fe5"
+    source-commit: "42c89d9c66dbe137139b047fd54aed49b66d1a5e"
     source-submodules: []
     source-type: git
     plugin: dump
@@ -21,7 +21,7 @@ parts:
       - "-charm-wheels"
   ols-layers:
     source: https://git.launchpad.net/ols-charm-deps
-    source-commit: "56d219f60a293a6c73759b8439ef5fdb11e19d1f"
+    source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
     source-submodules: []
     source-type: git
     plugin: dump
@@ -53,10 +53,11 @@ parts:
       - launchpad-layers
     source: .
     plugin: reactive
-    build-snaps: [charm/2.x/stable]
-    build-packages: [libpq-dev]
+    build-snaps: [charm]
+    build-packages: [libpq-dev, python3-dev]
     build-environment:
       - CHARM_LAYERS_DIR: $CRAFT_STAGE/layers/layer
       - CHARM_INTERFACES_DIR: $CRAFT_STAGE/layers/interface
       - PIP_NO_INDEX: "true"
       - PIP_FIND_LINKS: $CRAFT_STAGE/charm-wheels
+    reactive-charm-build-arguments: [--binary-wheels-from-source]
diff --git a/charm/launchpad/charmcraft.yaml b/charm/launchpad/charmcraft.yaml
index e7ec243..f40eac4 100644
--- a/charm/launchpad/charmcraft.yaml
+++ b/charm/launchpad/charmcraft.yaml
@@ -11,7 +11,7 @@ bases:
 parts:
   charm-wheels:
     source: https://git.launchpad.net/~ubuntuone-hackers/ols-charm-deps/+git/wheels
-    source-commit: "59b32ae07f98051385c96d6d8e7e02ca4f197fe5"
+    source-commit: "42c89d9c66dbe137139b047fd54aed49b66d1a5e"
     source-submodules: []
     source-type: git
     plugin: dump
@@ -21,7 +21,7 @@ parts:
       - "-charm-wheels"
   ols-layers:
     source: https://git.launchpad.net/ols-charm-deps
-    source-commit: "56d219f60a293a6c73759b8439ef5fdb11e19d1f"
+    source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
     source-submodules: []
     source-type: git
     plugin: dump
@@ -52,10 +52,11 @@ parts:
       - launchpad-layers
     source: .
     plugin: reactive
-    build-snaps: [charm/2.x/stable]
-    build-packages: [libpq-dev]
+    build-snaps: [charm]
+    build-packages: [libpq-dev, python3-dev]
     build-environment:
       - CHARM_LAYERS_DIR: $CRAFT_STAGE/layers/layer
       - CHARM_INTERFACES_DIR: $CRAFT_STAGE/layers/interface
       - PIP_NO_INDEX: "true"
       - PIP_FIND_LINKS: $CRAFT_STAGE/charm-wheels
+    reactive-charm-build-arguments: [--binary-wheels-from-source]