Launchpad itself

Merge ~ines-almeida/launchpad:bump-launchpad-layers into launchpad:master

  1. Git
  2. lp:~ines-almeida/launchpad
  3. bump-launchpad-layers
  4. Merge into master
Proposed by Ines Almeida
Status: Merged
Approved by: Ines Almeida
Approved revision: 4420cf92a79015785ed2090be4723d5e9806a9ea
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~ines-almeida/launchpad:bump-launchpad-layers
Merge into: launchpad:master
Diff against target: 208 lines (+16/-16)
16 files modified
charm/launchpad-admin/charmcraft.yaml (+1/-1)
charm/launchpad-appserver/charmcraft.yaml (+1/-1)
charm/launchpad-assets/charmcraft.yaml (+1/-1)
charm/launchpad-buildd-manager/charmcraft.yaml (+1/-1)
charm/launchpad-codehosting/charmcraft.yaml (+1/-1)
charm/launchpad-copy-archive-publisher/charmcraft.yaml (+1/-1)
charm/launchpad-db-update/charmcraft.yaml (+1/-1)
charm/launchpad-debian-importer/charmcraft.yaml (+1/-1)
charm/launchpad-ftpmaster-publisher/charmcraft.yaml (+1/-1)
charm/launchpad-ftpmaster-uploader/charmcraft.yaml (+1/-1)
charm/launchpad-librarian/charmcraft.yaml (+1/-1)
charm/launchpad-loggerhead/charmcraft.yaml (+1/-1)
charm/launchpad-ppa-publisher/charmcraft.yaml (+1/-1)
charm/launchpad-ppa-uploader/charmcraft.yaml (+1/-1)
charm/launchpad-scripts-bzrsyncd/charmcraft.yaml (+1/-1)
charm/launchpad-scripts/charmcraft.yaml (+1/-1)
Reviewer Review Type Date Requested Status
Simone Pelosi Approve
Review via email: mp+462515@code.launchpad.net

Commit message

charms: bump launchpad-layers to 910dfb76754add5ed032a243c6081ee6a6b11256

The new source-commit updates the base configuration values for git related domains so that the git URLs exist even if the environment doesn't have git code hosting set up - which was causing issues in staging.

To post a comment you must log in.
Revision history for this message
Simone Pelosi (pelpsi) 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 3fa734d..bac0db1 100644
3--- a/charm/launchpad-admin/charmcraft.yaml
4+++ b/charm/launchpad-admin/charmcraft.yaml
5@@ -35,7 +35,7 @@ parts:
6 after:
7 - ols-layers
8 source: https://git.launchpad.net/launchpad-layers
9- source-commit: "0fd04056ad0ddb366be6ad7d50991efed385ec48"
10+ source-commit: "910dfb76754add5ed032a243c6081ee6a6b11256"
11 source-submodules: []
12 source-type: git
13 plugin: dump
14diff --git a/charm/launchpad-appserver/charmcraft.yaml b/charm/launchpad-appserver/charmcraft.yaml
15index 607181d..8cd8c6a 100644
16--- a/charm/launchpad-appserver/charmcraft.yaml
17+++ b/charm/launchpad-appserver/charmcraft.yaml
18@@ -35,7 +35,7 @@ parts:
19 after:
20 - ols-layers
21 source: https://git.launchpad.net/launchpad-layers
22- source-commit: "0fd04056ad0ddb366be6ad7d50991efed385ec48"
23+ source-commit: "910dfb76754add5ed032a243c6081ee6a6b11256"
24 source-submodules: []
25 source-type: git
26 plugin: dump
27diff --git a/charm/launchpad-assets/charmcraft.yaml b/charm/launchpad-assets/charmcraft.yaml
28index 5d3fc15..6a7ee47 100644
29--- a/charm/launchpad-assets/charmcraft.yaml
30+++ b/charm/launchpad-assets/charmcraft.yaml
31@@ -35,7 +35,7 @@ parts:
32 after:
33 - ols-layers
34 source: https://git.launchpad.net/launchpad-layers
35- source-commit: "0fd04056ad0ddb366be6ad7d50991efed385ec48"
36+ source-commit: "910dfb76754add5ed032a243c6081ee6a6b11256"
37 source-submodules: []
38 source-type: git
39 plugin: dump
40diff --git a/charm/launchpad-buildd-manager/charmcraft.yaml b/charm/launchpad-buildd-manager/charmcraft.yaml
41index 3fa734d..bac0db1 100644
42--- a/charm/launchpad-buildd-manager/charmcraft.yaml
43+++ b/charm/launchpad-buildd-manager/charmcraft.yaml
44@@ -35,7 +35,7 @@ parts:
45 after:
46 - ols-layers
47 source: https://git.launchpad.net/launchpad-layers
48- source-commit: "0fd04056ad0ddb366be6ad7d50991efed385ec48"
49+ source-commit: "910dfb76754add5ed032a243c6081ee6a6b11256"
50 source-submodules: []
51 source-type: git
52 plugin: dump
53diff --git a/charm/launchpad-codehosting/charmcraft.yaml b/charm/launchpad-codehosting/charmcraft.yaml
54index 57c980a..3d16c55 100644
55--- a/charm/launchpad-codehosting/charmcraft.yaml
56+++ b/charm/launchpad-codehosting/charmcraft.yaml
57@@ -35,7 +35,7 @@ parts:
58 after:
59 - ols-layers
60 source: https://git.launchpad.net/launchpad-layers
61- source-commit: "0fd04056ad0ddb366be6ad7d50991efed385ec48"
62+ source-commit: "910dfb76754add5ed032a243c6081ee6a6b11256"
63 source-submodules: []
64 source-type: git
65 plugin: dump
66diff --git a/charm/launchpad-copy-archive-publisher/charmcraft.yaml b/charm/launchpad-copy-archive-publisher/charmcraft.yaml
67index 605f876..254fc3f 100644
68--- a/charm/launchpad-copy-archive-publisher/charmcraft.yaml
69+++ b/charm/launchpad-copy-archive-publisher/charmcraft.yaml
70@@ -35,7 +35,7 @@ parts:
71 after:
72 - ols-layers
73 source: https://git.launchpad.net/launchpad-layers
74- source-commit: "0fd04056ad0ddb366be6ad7d50991efed385ec48"
75+ source-commit: "910dfb76754add5ed032a243c6081ee6a6b11256"
76 source-submodules: []
77 source-type: git
78 plugin: dump
79diff --git a/charm/launchpad-db-update/charmcraft.yaml b/charm/launchpad-db-update/charmcraft.yaml
80index 3fa734d..bac0db1 100644
81--- a/charm/launchpad-db-update/charmcraft.yaml
82+++ b/charm/launchpad-db-update/charmcraft.yaml
83@@ -35,7 +35,7 @@ parts:
84 after:
85 - ols-layers
86 source: https://git.launchpad.net/launchpad-layers
87- source-commit: "0fd04056ad0ddb366be6ad7d50991efed385ec48"
88+ source-commit: "910dfb76754add5ed032a243c6081ee6a6b11256"
89 source-submodules: []
90 source-type: git
91 plugin: dump
92diff --git a/charm/launchpad-debian-importer/charmcraft.yaml b/charm/launchpad-debian-importer/charmcraft.yaml
93index 3fa734d..bac0db1 100644
94--- a/charm/launchpad-debian-importer/charmcraft.yaml
95+++ b/charm/launchpad-debian-importer/charmcraft.yaml
96@@ -35,7 +35,7 @@ parts:
97 after:
98 - ols-layers
99 source: https://git.launchpad.net/launchpad-layers
100- source-commit: "0fd04056ad0ddb366be6ad7d50991efed385ec48"
101+ source-commit: "910dfb76754add5ed032a243c6081ee6a6b11256"
102 source-submodules: []
103 source-type: git
104 plugin: dump
105diff --git a/charm/launchpad-ftpmaster-publisher/charmcraft.yaml b/charm/launchpad-ftpmaster-publisher/charmcraft.yaml
106index 605f876..254fc3f 100644
107--- a/charm/launchpad-ftpmaster-publisher/charmcraft.yaml
108+++ b/charm/launchpad-ftpmaster-publisher/charmcraft.yaml
109@@ -35,7 +35,7 @@ parts:
110 after:
111 - ols-layers
112 source: https://git.launchpad.net/launchpad-layers
113- source-commit: "0fd04056ad0ddb366be6ad7d50991efed385ec48"
114+ source-commit: "910dfb76754add5ed032a243c6081ee6a6b11256"
115 source-submodules: []
116 source-type: git
117 plugin: dump
118diff --git a/charm/launchpad-ftpmaster-uploader/charmcraft.yaml b/charm/launchpad-ftpmaster-uploader/charmcraft.yaml
119index d809220..984c713 100644
120--- a/charm/launchpad-ftpmaster-uploader/charmcraft.yaml
121+++ b/charm/launchpad-ftpmaster-uploader/charmcraft.yaml
122@@ -35,7 +35,7 @@ parts:
123 after:
124 - ols-layers
125 source: https://git.launchpad.net/launchpad-layers
126- source-commit: "0fd04056ad0ddb366be6ad7d50991efed385ec48"
127+ source-commit: "910dfb76754add5ed032a243c6081ee6a6b11256"
128 source-submodules: []
129 source-type: git
130 plugin: dump
131diff --git a/charm/launchpad-librarian/charmcraft.yaml b/charm/launchpad-librarian/charmcraft.yaml
132index c9424b8..88486ff 100644
133--- a/charm/launchpad-librarian/charmcraft.yaml
134+++ b/charm/launchpad-librarian/charmcraft.yaml
135@@ -35,7 +35,7 @@ parts:
136 after:
137 - ols-layers
138 source: https://git.launchpad.net/launchpad-layers
139- source-commit: "0fd04056ad0ddb366be6ad7d50991efed385ec48"
140+ source-commit: "910dfb76754add5ed032a243c6081ee6a6b11256"
141 source-submodules: []
142 source-type: git
143 plugin: dump
144diff --git a/charm/launchpad-loggerhead/charmcraft.yaml b/charm/launchpad-loggerhead/charmcraft.yaml
145index b045ce3..2f717b3 100644
146--- a/charm/launchpad-loggerhead/charmcraft.yaml
147+++ b/charm/launchpad-loggerhead/charmcraft.yaml
148@@ -35,7 +35,7 @@ parts:
149 after:
150 - ols-layers
151 source: https://git.launchpad.net/launchpad-layers
152- source-commit: "0fd04056ad0ddb366be6ad7d50991efed385ec48"
153+ source-commit: "910dfb76754add5ed032a243c6081ee6a6b11256"
154 source-submodules: []
155 source-type: git
156 plugin: dump
157diff --git a/charm/launchpad-ppa-publisher/charmcraft.yaml b/charm/launchpad-ppa-publisher/charmcraft.yaml
158index 57c980a..3d16c55 100644
159--- a/charm/launchpad-ppa-publisher/charmcraft.yaml
160+++ b/charm/launchpad-ppa-publisher/charmcraft.yaml
161@@ -35,7 +35,7 @@ parts:
162 after:
163 - ols-layers
164 source: https://git.launchpad.net/launchpad-layers
165- source-commit: "0fd04056ad0ddb366be6ad7d50991efed385ec48"
166+ source-commit: "910dfb76754add5ed032a243c6081ee6a6b11256"
167 source-submodules: []
168 source-type: git
169 plugin: dump
170diff --git a/charm/launchpad-ppa-uploader/charmcraft.yaml b/charm/launchpad-ppa-uploader/charmcraft.yaml
171index d809220..984c713 100644
172--- a/charm/launchpad-ppa-uploader/charmcraft.yaml
173+++ b/charm/launchpad-ppa-uploader/charmcraft.yaml
174@@ -35,7 +35,7 @@ parts:
175 after:
176 - ols-layers
177 source: https://git.launchpad.net/launchpad-layers
178- source-commit: "0fd04056ad0ddb366be6ad7d50991efed385ec48"
179+ source-commit: "910dfb76754add5ed032a243c6081ee6a6b11256"
180 source-submodules: []
181 source-type: git
182 plugin: dump
183diff --git a/charm/launchpad-scripts-bzrsyncd/charmcraft.yaml b/charm/launchpad-scripts-bzrsyncd/charmcraft.yaml
184index 3fa734d..bac0db1 100644
185--- a/charm/launchpad-scripts-bzrsyncd/charmcraft.yaml
186+++ b/charm/launchpad-scripts-bzrsyncd/charmcraft.yaml
187@@ -35,7 +35,7 @@ parts:
188 after:
189 - ols-layers
190 source: https://git.launchpad.net/launchpad-layers
191- source-commit: "0fd04056ad0ddb366be6ad7d50991efed385ec48"
192+ source-commit: "910dfb76754add5ed032a243c6081ee6a6b11256"
193 source-submodules: []
194 source-type: git
195 plugin: dump
196diff --git a/charm/launchpad-scripts/charmcraft.yaml b/charm/launchpad-scripts/charmcraft.yaml
197index 3fa734d..bac0db1 100644
198--- a/charm/launchpad-scripts/charmcraft.yaml
199+++ b/charm/launchpad-scripts/charmcraft.yaml
200@@ -35,7 +35,7 @@ parts:
201 after:
202 - ols-layers
203 source: https://git.launchpad.net/launchpad-layers
204- source-commit: "0fd04056ad0ddb366be6ad7d50991efed385ec48"
205+ source-commit: "910dfb76754add5ed032a243c6081ee6a6b11256"
206 source-submodules: []
207 source-type: git
208 plugin: dump

Subscribers

People subscribed via source and target branches

to status/vote changes: