launchpad-reviewers team mailing list archive

[Colin Watson <mp+451158@xxxxxxxxxxxxxxxxxx>]

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

Commit message:
charm: Update ols-layers to 9c59a9804f

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

This pulls in "Specify YAML exceptions in ols-http layer" and "Only prune payloads if current and desired build labels differ"; the latter fixes occasional problems where the old payload is pruned before Launchpad processes have restarted and stopped using it.

I also synced up `launchpad-copy-archive-publisher`, which had out-of-date versions of charm-wheels and ols-layers.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:charm-update-ols-layers into launchpad:master.

diff --git a/charm/launchpad-admin/charmcraft.yaml b/charm/launchpad-admin/charmcraft.yaml
index afb3e49..51efad1 100644
--- a/charm/launchpad-admin/charmcraft.yaml
+++ b/charm/launchpad-admin/charmcraft.yaml
@@ -21,7 +21,7 @@ parts:
       - "-charm-wheels"
   ols-layers:
     source: https://git.launchpad.net/ols-charm-deps
-    source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
+    source-commit: "9c59a9804f1f40e2a74be7dac9bf18a655a7864f"
     source-submodules: []
     source-type: git
     plugin: dump
diff --git a/charm/launchpad-appserver/charmcraft.yaml b/charm/launchpad-appserver/charmcraft.yaml
index 63cbe4d..3c822a9 100644
--- a/charm/launchpad-appserver/charmcraft.yaml
+++ b/charm/launchpad-appserver/charmcraft.yaml
@@ -21,7 +21,7 @@ parts:
       - "-charm-wheels"
   ols-layers:
     source: https://git.launchpad.net/ols-charm-deps
-    source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
+    source-commit: "9c59a9804f1f40e2a74be7dac9bf18a655a7864f"
     source-submodules: []
     source-type: git
     plugin: dump
diff --git a/charm/launchpad-assets/charmcraft.yaml b/charm/launchpad-assets/charmcraft.yaml
index 40bc39d..200d698 100644
--- a/charm/launchpad-assets/charmcraft.yaml
+++ b/charm/launchpad-assets/charmcraft.yaml
@@ -21,7 +21,7 @@ parts:
       - "-charm-wheels"
   ols-layers:
     source: https://git.launchpad.net/ols-charm-deps
-    source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
+    source-commit: "9c59a9804f1f40e2a74be7dac9bf18a655a7864f"
     source-submodules: []
     source-type: git
     plugin: dump
diff --git a/charm/launchpad-buildd-manager/charmcraft.yaml b/charm/launchpad-buildd-manager/charmcraft.yaml
index afb3e49..51efad1 100644
--- a/charm/launchpad-buildd-manager/charmcraft.yaml
+++ b/charm/launchpad-buildd-manager/charmcraft.yaml
@@ -21,7 +21,7 @@ parts:
       - "-charm-wheels"
   ols-layers:
     source: https://git.launchpad.net/ols-charm-deps
-    source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
+    source-commit: "9c59a9804f1f40e2a74be7dac9bf18a655a7864f"
     source-submodules: []
     source-type: git
     plugin: dump
diff --git a/charm/launchpad-copy-archive-publisher/charmcraft.yaml b/charm/launchpad-copy-archive-publisher/charmcraft.yaml
index 4939bf9..2523a03 100644
--- a/charm/launchpad-copy-archive-publisher/charmcraft.yaml
+++ b/charm/launchpad-copy-archive-publisher/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: "9c59a9804f1f40e2a74be7dac9bf18a655a7864f"
     source-submodules: []
     source-type: git
     plugin: dump
diff --git a/charm/launchpad-debian-importer/charmcraft.yaml b/charm/launchpad-debian-importer/charmcraft.yaml
index afb3e49..51efad1 100644
--- a/charm/launchpad-debian-importer/charmcraft.yaml
+++ b/charm/launchpad-debian-importer/charmcraft.yaml
@@ -21,7 +21,7 @@ parts:
       - "-charm-wheels"
   ols-layers:
     source: https://git.launchpad.net/ols-charm-deps
-    source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
+    source-commit: "9c59a9804f1f40e2a74be7dac9bf18a655a7864f"
     source-submodules: []
     source-type: git
     plugin: dump
diff --git a/charm/launchpad-frontend-extras/charmcraft.yaml b/charm/launchpad-frontend-extras/charmcraft.yaml
index 0187d46..2782e78 100644
--- a/charm/launchpad-frontend-extras/charmcraft.yaml
+++ b/charm/launchpad-frontend-extras/charmcraft.yaml
@@ -21,7 +21,7 @@ parts:
       - "-charm-wheels"
   ols-layers:
     source: https://git.launchpad.net/ols-charm-deps
-    source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
+    source-commit: "9c59a9804f1f40e2a74be7dac9bf18a655a7864f"
     source-submodules: []
     source-type: git
     plugin: dump
diff --git a/charm/launchpad-ftpmaster-publisher/charmcraft.yaml b/charm/launchpad-ftpmaster-publisher/charmcraft.yaml
index be010a1..a4de07b 100644
--- a/charm/launchpad-ftpmaster-publisher/charmcraft.yaml
+++ b/charm/launchpad-ftpmaster-publisher/charmcraft.yaml
@@ -21,7 +21,7 @@ parts:
       - "-charm-wheels"
   ols-layers:
     source: https://git.launchpad.net/ols-charm-deps
-    source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
+    source-commit: "9c59a9804f1f40e2a74be7dac9bf18a655a7864f"
     source-submodules: []
     source-type: git
     plugin: dump
diff --git a/charm/launchpad-ftpmaster-uploader/charmcraft.yaml b/charm/launchpad-ftpmaster-uploader/charmcraft.yaml
index 7d5cf6a..392d3ad 100644
--- a/charm/launchpad-ftpmaster-uploader/charmcraft.yaml
+++ b/charm/launchpad-ftpmaster-uploader/charmcraft.yaml
@@ -21,7 +21,7 @@ parts:
       - "-charm-wheels"
   ols-layers:
     source: https://git.launchpad.net/ols-charm-deps
-    source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
+    source-commit: "9c59a9804f1f40e2a74be7dac9bf18a655a7864f"
     source-submodules: []
     source-type: git
     plugin: dump
diff --git a/charm/launchpad-librarian/charmcraft.yaml b/charm/launchpad-librarian/charmcraft.yaml
index f0f55fc..d51b4f3 100644
--- a/charm/launchpad-librarian/charmcraft.yaml
+++ b/charm/launchpad-librarian/charmcraft.yaml
@@ -21,7 +21,7 @@ parts:
       - "-charm-wheels"
   ols-layers:
     source: https://git.launchpad.net/ols-charm-deps
-    source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
+    source-commit: "9c59a9804f1f40e2a74be7dac9bf18a655a7864f"
     source-submodules: []
     source-type: git
     plugin: dump
diff --git a/charm/launchpad-ppa-publisher/charmcraft.yaml b/charm/launchpad-ppa-publisher/charmcraft.yaml
index 187e366..76dc78c 100644
--- a/charm/launchpad-ppa-publisher/charmcraft.yaml
+++ b/charm/launchpad-ppa-publisher/charmcraft.yaml
@@ -21,7 +21,7 @@ parts:
       - "-charm-wheels"
   ols-layers:
     source: https://git.launchpad.net/ols-charm-deps
-    source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
+    source-commit: "9c59a9804f1f40e2a74be7dac9bf18a655a7864f"
     source-submodules: []
     source-type: git
     plugin: dump
diff --git a/charm/launchpad-ppa-uploader/charmcraft.yaml b/charm/launchpad-ppa-uploader/charmcraft.yaml
index a872ea2..4ff69d8 100644
--- a/charm/launchpad-ppa-uploader/charmcraft.yaml
+++ b/charm/launchpad-ppa-uploader/charmcraft.yaml
@@ -21,7 +21,7 @@ parts:
       - "-charm-wheels"
   ols-layers:
     source: https://git.launchpad.net/ols-charm-deps
-    source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
+    source-commit: "9c59a9804f1f40e2a74be7dac9bf18a655a7864f"
     source-submodules: []
     source-type: git
     plugin: dump
diff --git a/charm/launchpad-scripts-bzrsyncd/charmcraft.yaml b/charm/launchpad-scripts-bzrsyncd/charmcraft.yaml
index afb3e49..51efad1 100644
--- a/charm/launchpad-scripts-bzrsyncd/charmcraft.yaml
+++ b/charm/launchpad-scripts-bzrsyncd/charmcraft.yaml
@@ -21,7 +21,7 @@ parts:
       - "-charm-wheels"
   ols-layers:
     source: https://git.launchpad.net/ols-charm-deps
-    source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
+    source-commit: "9c59a9804f1f40e2a74be7dac9bf18a655a7864f"
     source-submodules: []
     source-type: git
     plugin: dump
diff --git a/charm/launchpad-scripts/charmcraft.yaml b/charm/launchpad-scripts/charmcraft.yaml
index afb3e49..51efad1 100644
--- a/charm/launchpad-scripts/charmcraft.yaml
+++ b/charm/launchpad-scripts/charmcraft.yaml
@@ -21,7 +21,7 @@ parts:
       - "-charm-wheels"
   ols-layers:
     source: https://git.launchpad.net/ols-charm-deps
-    source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
+    source-commit: "9c59a9804f1f40e2a74be7dac9bf18a655a7864f"
     source-submodules: []
     source-type: git
     plugin: dump
diff --git a/charm/launchpad/charmcraft.yaml b/charm/launchpad/charmcraft.yaml
index 7fa28f1..60c2c7b 100644
--- a/charm/launchpad/charmcraft.yaml
+++ b/charm/launchpad/charmcraft.yaml
@@ -21,7 +21,7 @@ parts:
       - "-charm-wheels"
   ols-layers:
     source: https://git.launchpad.net/ols-charm-deps
-    source-commit: "f63ae0386275bf9089b30c8abae252a0ea523633"
+    source-commit: "9c59a9804f1f40e2a74be7dac9bf18a655a7864f"
     source-submodules: []
     source-type: git
     plugin: dump