Merge lp:~alejdg/mojo/jenkins-charm-testing into lp:mojo/mojo-specs
- jenkins-charm-testing
- Merge into mojo-specs
Proposed by
Alexandre Gomes
Status: | Merged |
---|---|
Approved by: | Tom Haddon |
Approved revision: | 155 |
Merged at revision: | 151 |
Proposed branch: | lp:~alejdg/mojo/jenkins-charm-testing |
Merge into: | lp:mojo/mojo-specs |
Diff against target: |
297 lines (+143/-142) 1 file modified
charm-testing/jenkins/deploy (+143/-142) |
To merge this branch: | bzr merge lp:~alejdg/mojo/jenkins-charm-testing |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tom Haddon | Approve | ||
Review via email: mp+378361@code.launchpad.net |
Commit message
Fix jenkins spec
Description of the change
To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote : | # |
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote : | # |
Change successfully merged at revision 151
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'charm-testing/jenkins/deploy' |
2 | --- charm-testing/jenkins/deploy 2019-10-08 00:59:46 +0000 |
3 | +++ charm-testing/jenkins/deploy 2020-01-30 23:01:19 +0000 |
4 | @@ -13,150 +13,151 @@ |
5 | # display-url-api, mailer, matrix-auth, openid, openid4java |
6 | # Do not remove |
7 | plugins: >- |
8 | - ace-editor-1.1 |
9 | - analysis-core-1.95 |
10 | - ansicolor-0.5.2 |
11 | + ace-editor |
12 | + analysis-core |
13 | + ansicolor |
14 | ant |
15 | - antisamy-markup-formatter-1.5 |
16 | - apache-httpcomponents-client-4-api-4.5.5-3.0 |
17 | - authentication-tokens-1.3 |
18 | - aws-credentials-1.23 |
19 | - aws-java-sdk-1.11.403 |
20 | - bazaar-1.22 |
21 | - blueocean-1.8.2 |
22 | - blueocean-autofavorite-1.2.2 |
23 | - blueocean-bitbucket-pipeline-1.8.2 |
24 | - blueocean-commons-1.8.2 |
25 | - blueocean-config-1.8.2 |
26 | - blueocean-core-js-1.8.2 |
27 | - blueocean-dashboard-1.8.2 |
28 | - blueocean-display-url-2.2.0 |
29 | - blueocean-events-1.8.2 |
30 | - blueocean-git-pipeline-1.8.2 |
31 | - blueocean-github-pipeline-1.8.2 |
32 | - blueocean-i18n-1.8.2 |
33 | - blueocean-jira-1.8.2 |
34 | - blueocean-jwt-1.8.2 |
35 | - blueocean-personalization-1.8.2 |
36 | - blueocean-pipeline-api-impl-1.8.2 |
37 | - blueocean-pipeline-editor-1.8.2 |
38 | - blueocean-pipeline-scm-api-1.8.2 |
39 | - blueocean-rest-1.8.2 |
40 | - blueocean-rest-impl-1.8.2 |
41 | - blueocean-web-1.8.2 |
42 | - bouncycastle-api-2.17 |
43 | - branch-api-2.0.20 |
44 | - build-blocker-plugin-1.7.3 |
45 | - build-monitor-plugin-1.12+build.201809061734 |
46 | - build-timeout-1.19 |
47 | - claim-2.15 |
48 | - cloudbees-bitbucket-branch-source-2.2.12 |
49 | - cloudbees-folder-6.6 |
50 | - command-launcher-1.2 |
51 | - conditional-buildstep-1.3.6 |
52 | - copyartifact-1.41 |
53 | - credentials-2.1.18 |
54 | - credentials-binding-1.16 |
55 | - dashboard-view-2.9.11 |
56 | - dependency-check-jenkins-plugin-3.3.2 |
57 | - description-setter-1.10 |
58 | - disk-usage-0.2.8 |
59 | - display-url-api-2.2.0 |
60 | - docker-build-publish-1.3.2 |
61 | - docker-build-step-2.0 |
62 | - docker-commons-1.13 |
63 | - docker-workflow-1.17 |
64 | - durable-task-1.25 |
65 | - ec2-1.39 |
66 | - email-ext-2.63 |
67 | - external-monitor-job-1.7 |
68 | - favorite-2.3.2 |
69 | - generic-webhook-trigger-1.45 |
70 | - ghprb-1.42.0 |
71 | - git-3.9.1 |
72 | - git-client-2.7.3 |
73 | - git-server-1.7 |
74 | - github-1.29.2 |
75 | - github-api-1.92 |
76 | - github-branch-source-2.3.6 |
77 | - github-organization-folder-1.6 |
78 | - github-pullrequest-0.2.3 |
79 | - handlebars-1.1.1 |
80 | - handy-uri-templates-2-api-2.1.6-1.0 |
81 | - htmlpublisher-1.16 |
82 | - icon-shim-2.0.3 |
83 | - instant-messaging-1.35 |
84 | - ircbot-2.30 |
85 | - jackson2-api-2.8.11.3 |
86 | - javadoc-1.4 |
87 | - jenkins-design-language-1.8.2 |
88 | - jira-3.0.1 |
89 | - jquery-1.12.4-0 |
90 | - jquery-detached-1.2.1 |
91 | - jsch-0.1.54.2 |
92 | - junit-1.25 |
93 | - ldap-1.20 |
94 | - mailer-1.21 |
95 | - matrix-auth-2.3 |
96 | - matrix-combinations-parameter-1.3.0 |
97 | - matrix-project-1.13 |
98 | - maven-plugin-3.1.2 |
99 | - mercurial-2.4 |
100 | - momentjs-1.1.1 |
101 | - node-iterator-api-1.5.0 |
102 | - nodelabelparameter-1.7.2 |
103 | - openid-2.3 |
104 | - openid4java-0.9.8.0 |
105 | - pam-auth-1.4 |
106 | - parameterized-scheduler-0.6.3 |
107 | - parameterized-trigger-2.35.2 |
108 | - pipeline-build-step-2.7 |
109 | - pipeline-github-lib-1.0 |
110 | - pipeline-graph-analysis-1.7 |
111 | - pipeline-input-step-2.8 |
112 | - pipeline-milestone-step-1.3.1 |
113 | - pipeline-model-api-1.3.2 |
114 | - pipeline-model-declarative-agent-1.1.1 |
115 | - pipeline-model-definition-1.3.2 |
116 | - pipeline-model-extensions-1.3.2 |
117 | - pipeline-rest-api-2.10 |
118 | - pipeline-stage-step-2.3 |
119 | - pipeline-stage-tags-metadata-1.3.2 |
120 | - pipeline-stage-view-2.10 |
121 | - pipeline-utility-steps-2.1.0 |
122 | - plain-credentials-1.4 |
123 | - postbuildscript-2.7.0 |
124 | - pubsub-light-1.12 |
125 | - rebuild-1.28 |
126 | - resource-disposer-0.12 |
127 | - run-condition-1.2 |
128 | - scm-api-2.2.7 |
129 | - script-security-1.46 |
130 | - secondary-timestamper-plugin-1.1 |
131 | - sse-gateway-1.15 |
132 | - ssh-agent-1.16 |
133 | - ssh-credentials-1.14 |
134 | - structs-1.14 |
135 | - thinBackup-1.9 |
136 | - timestamper-1.8.10 |
137 | - token-macro-2.5 |
138 | - variant-1.1 |
139 | - windows-slaves-1.3.1 |
140 | - workflow-aggregator-2.5 |
141 | - workflow-api-2.29 |
142 | - workflow-basic-steps-2.8.2 |
143 | - workflow-cps-2.55 |
144 | - workflow-cps-global-lib-2.11 |
145 | - workflow-durable-task-step-2.21 |
146 | - workflow-job-2.25 |
147 | - workflow-multibranch-2.20 |
148 | - workflow-remote-loader-1.4 |
149 | - workflow-scm-step-2.6 |
150 | - workflow-step-api-2.16 |
151 | - workflow-support-2.20 |
152 | - ws-cleanup-0.34 |
153 | + antisamy-markup-formatter |
154 | + apache-httpcomponents-client-4-api |
155 | + authentication-tokens |
156 | + aws-credentials |
157 | + aws-java-sdk |
158 | + bazaar |
159 | + blueocean |
160 | + blueocean-autofavorite |
161 | + blueocean-bitbucket-pipeline |
162 | + blueocean-commons |
163 | + blueocean-config |
164 | + blueocean-core-js |
165 | + blueocean-dashboard |
166 | + blueocean-display-url |
167 | + blueocean-events |
168 | + blueocean-git-pipeline |
169 | + blueocean-github-pipeline |
170 | + blueocean-i18n |
171 | + blueocean-jira |
172 | + blueocean-jwt |
173 | + blueocean-personalization |
174 | + blueocean-pipeline-api-impl |
175 | + blueocean-pipeline-editor |
176 | + blueocean-pipeline-scm-api |
177 | + blueocean-rest |
178 | + blueocean-rest-impl |
179 | + blueocean-web |
180 | + bouncycastle-api |
181 | + branch-api |
182 | + build-blocker-plugin |
183 | + build-monitor-plugin |
184 | + build-timeout |
185 | + claim |
186 | + cloudbees-bitbucket-branch-source |
187 | + cloudbees-folder |
188 | + command-launcher |
189 | + conditional-buildstep |
190 | + copyartifact |
191 | + credentials |
192 | + credentials-binding |
193 | + dashboard-view |
194 | + dependency-check-jenkins-plugin |
195 | + description-setter |
196 | + disk-usage |
197 | + display-url-api |
198 | + docker-build-publish |
199 | + docker-build-step |
200 | + docker-commons |
201 | + docker-workflow |
202 | + durable-task |
203 | + ec2 |
204 | + email-ext |
205 | + external-monitor-job |
206 | + favorite |
207 | + generic-webhook-trigger |
208 | + ghprb |
209 | + git |
210 | + git-client |
211 | + git-server |
212 | + github |
213 | + github-api |
214 | + github-branch-source |
215 | + github-organization-folder |
216 | + github-pullrequest |
217 | + handlebars |
218 | + handy-uri-templates-2-api |
219 | + htmlpublisher |
220 | + icon-shim |
221 | + instant-messaging |
222 | + ircbot |
223 | + jackson2-api |
224 | + javadoc |
225 | + jenkins-design-language |
226 | + jira |
227 | + jquery |
228 | + jquery-detached |
229 | + jsch |
230 | + junit |
231 | + ldap |
232 | + mailer |
233 | + matrix-auth |
234 | + matrix-combinations-parameter |
235 | + matrix-project |
236 | + maven-plugin |
237 | + mercurial |
238 | + momentjs |
239 | + node-iterator-api |
240 | + nodelabelparameter |
241 | + openid |
242 | + openid4java |
243 | + pam-auth |
244 | + parameterized-scheduler |
245 | + parameterized-trigger |
246 | + pipeline-build-step |
247 | + pipeline-github-lib |
248 | + pipeline-graph-analysis |
249 | + pipeline-input-step |
250 | + pipeline-milestone-step |
251 | + pipeline-model-api |
252 | + pipeline-model-declarative-agent |
253 | + pipeline-model-definition |
254 | + pipeline-model-extensions |
255 | + pipeline-rest-api |
256 | + pipeline-stage-step |
257 | + pipeline-stage-tags-metadata |
258 | + pipeline-stage-view |
259 | + pipeline-utility-steps |
260 | + plain-credentials |
261 | + postbuildscript |
262 | + pubsub-light |
263 | + rebuild |
264 | + resource-disposer |
265 | + run-condition |
266 | + scm-api |
267 | + script-security |
268 | + secondary-timestamper-plugin |
269 | + sse-gateway |
270 | + ssh-agent |
271 | + ssh-credentials |
272 | + structs |
273 | + thinBackup |
274 | + timestamper |
275 | + token-macro |
276 | + variant |
277 | + windows-slaves |
278 | + workflow-aggregator |
279 | + workflow-api |
280 | + workflow-basic-steps |
281 | + workflow-cps |
282 | + workflow-cps-global-lib |
283 | + workflow-durable-task-step |
284 | + workflow-job |
285 | + workflow-multibranch |
286 | + workflow-remote-loader |
287 | + workflow-scm-step |
288 | + workflow-step-api |
289 | + workflow-support |
290 | + ws-cleanup |
291 | remove-unlisted-plugins: "yes" |
292 | - plugins-site: "http://archive.admin.canonical.com/other/jenkins-plugins" |
293 | + plugins-site: "https://pkg.jenkins.canonical.com/plugins/" |
294 | + bundle-site: "https://pkg.jenkins.canonical.com" |
295 | release: bundle |
296 | tools: "" |
297 | nrpe: |
This merge proposal is being monitored by mergebot. Change the status to Approved to merge.