Merge lp:~1chb1n/ubuntu-openstack-ci/mappings-dev-cleanup into lp:ubuntu-openstack-ci
- mappings-dev-cleanup
- Merge into trunk
Proposed by
Ryan Beisner
Status: | Merged |
---|---|
Merged at revision: | 144 |
Proposed branch: | lp:~1chb1n/ubuntu-openstack-ci/mappings-dev-cleanup |
Merge into: | lp:ubuntu-openstack-ci |
Diff against target: |
1510 lines (+823/-282) 20 files modified
deployment/jobs/charm_amulet_test/config.xml (+1/-1) deployment/jobs/git-watch/config.xml (+13/-3) deployment/jobs/git_deploy_with_deployer/config.xml (+34/-3) deployment/jobs/mojo_runner/config.xml (+2/-0) deployment/jobs/mojo_runner_baremetal/config.xml (+1/-1) deployment/jobs/scheduled_trigger_deploy/config.xml (+3/-3) deployment/jobs/scheduled_trigger_lint/config.xml (+4/-5) deployment/jobs/scheduled_trigger_mojo_charmhelper_upgrade_icehouse_precise/config.xml (+4/-2) deployment/jobs/scheduled_trigger_mojo_charmhelper_upgrade_icehouse_trusty/config.xml (+4/-2) deployment/jobs/scheduled_trigger_mojo_charmhelper_upgrade_kilo_vivid/config.xml (+4/-2) deployment/jobs/scheduled_trigger_mojo_ha_phased_juno_trusty/config.xml (+4/-2) deployment/jobs/scheduled_trigger_sourcedeploy_trusty_icehouse/config.xml (+124/-0) deployment/jobs/scheduled_trigger_sourcedeploy_trusty_juno/config.xml (+124/-0) deployment/jobs/scheduled_trigger_sourcedeploy_trusty_kilo/config.xml (+124/-0) deployment/jobs/scheduled_trigger_sourcedeploy_trusty_master/config.xml (+124/-0) deployment/jobs/scheduled_trigger_unit/config.xml (+2/-3) dev/mappings-dev.yaml (+237/-0) job-parts/osci_job_common.sh (+1/-1) populate/mappings.yaml (+12/-253) scan_merge_props.py (+1/-1) |
To merge this branch: | bzr merge lp:~1chb1n/ubuntu-openstack-ci/mappings-dev-cleanup |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ryan Beisner | Pending | ||
Review via email: mp+264354@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'deployment/jobs/charm_amulet_test/config.xml' |
2 | --- deployment/jobs/charm_amulet_test/config.xml 2015-05-17 14:36:21 +0000 |
3 | +++ deployment/jobs/charm_amulet_test/config.xml 2015-07-09 21:20:32 +0000 |
4 | @@ -66,7 +66,7 @@ |
5 | </com.sonyericsson.rebuild.RebuildSettings> |
6 | <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4"> |
7 | <maxConcurrentPerNode>1</maxConcurrentPerNode> |
8 | - <maxConcurrentTotal>4</maxConcurrentTotal> |
9 | + <maxConcurrentTotal>7</maxConcurrentTotal> |
10 | <throttleEnabled>true</throttleEnabled> |
11 | <throttleOption>project</throttleOption> |
12 | </hudson.plugins.throttleconcurrents.ThrottleJobProperty> |
13 | |
14 | === modified file 'deployment/jobs/git-watch/config.xml' |
15 | --- deployment/jobs/git-watch/config.xml 2015-05-17 14:36:21 +0000 |
16 | +++ deployment/jobs/git-watch/config.xml 2015-07-09 21:20:32 +0000 |
17 | @@ -5,7 +5,9 @@ |
18 | https://github.com/coreycb/neutron
 |
19 | https://github.com/coreycb/horizon
 |
20 | https://git.launchpad.net/~corey.bryant/+git/horizon
 |
21 | -https://github.com/ryan-beisner/trigger-test</description> |
22 | +https://github.com/ryan-beisner/trigger-test
 |
23 | +https://github.com/markabaker/source_demo
 |
24 | +https://github.com/markabaker/horizon</description> |
25 | <logRotator class="hudson.tasks.LogRotator"> |
26 | <daysToKeep>7</daysToKeep> |
27 | <numToKeep>500</numToKeep> |
28 | @@ -20,8 +22,10 @@ |
29 | <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4"> |
30 | <maxConcurrentPerNode>1</maxConcurrentPerNode> |
31 | <maxConcurrentTotal>1</maxConcurrentTotal> |
32 | + <categories/> |
33 | <throttleEnabled>true</throttleEnabled> |
34 | <throttleOption>project</throttleOption> |
35 | + <configVersion>1</configVersion> |
36 | </hudson.plugins.throttleconcurrents.ThrottleJobProperty> |
37 | <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/> |
38 | </properties> |
39 | @@ -40,6 +44,12 @@ |
40 | <hudson.plugins.git.UserRemoteConfig> |
41 | <url>https://git.launchpad.net/~corey.bryant/+git/horizon</url> |
42 | </hudson.plugins.git.UserRemoteConfig> |
43 | + <hudson.plugins.git.UserRemoteConfig> |
44 | + <url>https://github.com/markabaker/source_demo</url> |
45 | + </hudson.plugins.git.UserRemoteConfig> |
46 | + <hudson.plugins.git.UserRemoteConfig> |
47 | + <url>https://github.com/markabaker/horizon</url> |
48 | + </hudson.plugins.git.UserRemoteConfig> |
49 | </userRemoteConfigs> |
50 | <branches> |
51 | <hudson.plugins.git.BranchSpec> |
52 | @@ -51,12 +61,12 @@ |
53 | <extensions/> |
54 | </scm> |
55 | <canRoam>true</canRoam> |
56 | - <disabled>false</disabled> |
57 | + <disabled>true</disabled> |
58 | <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding> |
59 | <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> |
60 | <triggers> |
61 | <hudson.triggers.SCMTrigger> |
62 | - <spec>*/5 * * * *</spec> |
63 | + <spec>*/1 * * * *</spec> |
64 | <ignorePostCommitHooks>false</ignorePostCommitHooks> |
65 | </hudson.triggers.SCMTrigger> |
66 | </triggers> |
67 | |
68 | === modified file 'deployment/jobs/git_deploy_with_deployer/config.xml' |
69 | --- deployment/jobs/git_deploy_with_deployer/config.xml 2015-05-17 14:36:21 +0000 |
70 | +++ deployment/jobs/git_deploy_with_deployer/config.xml 2015-07-09 21:20:32 +0000 |
71 | @@ -50,7 +50,7 @@ |
72 | <hudson.model.BooleanParameterDefinition> |
73 | <name>NO_POST_DESTROY</name> |
74 | <description>Set true to skip destroy after deployment. Note that the enviro will most likely be torn down by the next job!</description> |
75 | - <defaultValue>true</defaultValue> |
76 | + <defaultValue>false</defaultValue> |
77 | </hudson.model.BooleanParameterDefinition> |
78 | </parameterDefinitions> |
79 | </hudson.model.ParametersDefinitionProperty> |
80 | @@ -59,14 +59,14 @@ |
81 | </com.sonyericsson.rebuild.RebuildSettings> |
82 | <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4"> |
83 | <maxConcurrentPerNode>1</maxConcurrentPerNode> |
84 | - <maxConcurrentTotal>4</maxConcurrentTotal> |
85 | + <maxConcurrentTotal>2</maxConcurrentTotal> |
86 | <throttleEnabled>true</throttleEnabled> |
87 | <throttleOption>project</throttleOption> |
88 | </hudson.plugins.throttleconcurrents.ThrottleJobProperty> |
89 | <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/> |
90 | </properties> |
91 | <scm class="hudson.scm.NullSCM"/> |
92 | - <assignedNode>demo</assignedNode> |
93 | + <assignedNode>x86_64 || slave || trusty-slave</assignedNode> |
94 | <canRoam>false</canRoam> |
95 | <disabled>false</disabled> |
96 | <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding> |
97 | @@ -97,6 +97,37 @@ |
98 | <regexpForFailed>_:.*</regexpForFailed> |
99 | <setForMatrix>false</setForMatrix> |
100 | </hudson.plugins.descriptionsetter.DescriptionSetterPublisher> |
101 | + <hudson.plugins.emailext.ExtendedEmailPublisher plugin="email-ext@2.39.3"> |
102 | + <recipientList>$DEFAULT_RECIPIENTS, ryan.beisner@canonical.com, corey.bryant@canonical.com, marco.ceppi@canonical.com</recipientList> |
103 | + <configuredTriggers> |
104 | + <hudson.plugins.emailext.plugins.trigger.AlwaysTrigger> |
105 | + <email> |
106 | + <recipientList></recipientList> |
107 | + <subject>$PROJECT_DEFAULT_SUBJECT</subject> |
108 | + <body>$PROJECT_DEFAULT_CONTENT</body> |
109 | + <recipientProviders> |
110 | + <hudson.plugins.emailext.plugins.recipients.ListRecipientProvider/> |
111 | + </recipientProviders> |
112 | + <attachmentsPattern></attachmentsPattern> |
113 | + <attachBuildLog>false</attachBuildLog> |
114 | + <compressBuildLog>false</compressBuildLog> |
115 | + <replyTo>$PROJECT_DEFAULT_REPLYTO</replyTo> |
116 | + <contentType>project</contentType> |
117 | + </email> |
118 | + </hudson.plugins.emailext.plugins.trigger.AlwaysTrigger> |
119 | + </configuredTriggers> |
120 | + <contentType>text/html</contentType> |
121 | + <defaultSubject>$DEFAULT_SUBJECT - ${ENV,var="UBUNTU_RELEASE"}-${ENV,var="OPENSTACK_RELEASE"}-${ENV,var="INSTALLATION_SOURCE"}-${ENV,var="CHARM_SET"} ${ENV,var="DISPLAY_NAME"}</defaultSubject> |
122 | + <defaultContent>#${BUILD_NUMBER} ${ENV,var="UBUNTU_RELEASE"}-${ENV,var="OPENSTACK_RELEASE"}-${ENV,var="INSTALLATION_SOURCE"}-${ENV,var="CHARM_SET"} ${ENV,var="DISPLAY_NAME"} |
123 | +$DEFAULT_CONTENT</defaultContent> |
124 | + <attachmentsPattern></attachmentsPattern> |
125 | + <presendScript>$DEFAULT_PRESEND_SCRIPT</presendScript> |
126 | + <attachBuildLog>true</attachBuildLog> |
127 | + <compressBuildLog>false</compressBuildLog> |
128 | + <replyTo>$DEFAULT_REPLYTO</replyTo> |
129 | + <saveOutput>true</saveOutput> |
130 | + <disabled>false</disabled> |
131 | + </hudson.plugins.emailext.ExtendedEmailPublisher> |
132 | </publishers> |
133 | <buildWrappers> |
134 | <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/> |
135 | |
136 | === modified file 'deployment/jobs/mojo_runner/config.xml' |
137 | --- deployment/jobs/mojo_runner/config.xml 2015-05-17 14:36:21 +0000 |
138 | +++ deployment/jobs/mojo_runner/config.xml 2015-07-09 21:20:32 +0000 |
139 | @@ -58,8 +58,10 @@ |
140 | <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4"> |
141 | <maxConcurrentPerNode>1</maxConcurrentPerNode> |
142 | <maxConcurrentTotal>1</maxConcurrentTotal> |
143 | + <categories/> |
144 | <throttleEnabled>true</throttleEnabled> |
145 | <throttleOption>project</throttleOption> |
146 | + <configVersion>1</configVersion> |
147 | </hudson.plugins.throttleconcurrents.ThrottleJobProperty> |
148 | <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/> |
149 | </properties> |
150 | |
151 | === modified file 'deployment/jobs/mojo_runner_baremetal/config.xml' |
152 | --- deployment/jobs/mojo_runner_baremetal/config.xml 2015-05-17 14:36:21 +0000 |
153 | +++ deployment/jobs/mojo_runner_baremetal/config.xml 2015-07-09 21:20:32 +0000 |
154 | @@ -86,7 +86,7 @@ |
155 | <scm class="hudson.scm.NullSCM"/> |
156 | <assignedNode>dellstack</assignedNode> |
157 | <canRoam>false</canRoam> |
158 | - <disabled>true</disabled> |
159 | + <disabled>false</disabled> |
160 | <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding> |
161 | <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> |
162 | <triggers/> |
163 | |
164 | === modified file 'deployment/jobs/scheduled_trigger_deploy/config.xml' |
165 | --- deployment/jobs/scheduled_trigger_deploy/config.xml 2015-03-31 20:59:51 +0000 |
166 | +++ deployment/jobs/scheduled_trigger_deploy/config.xml 2015-07-09 21:20:32 +0000 |
167 | @@ -2,7 +2,7 @@ |
168 | <project> |
169 | <actions/> |
170 | <description>* Triggers deployments for all branches via branch_scanner job
 |
171 | -* Weekly on Sunday</description> |
172 | +* Daily</description> |
173 | <logRotator class="hudson.tasks.LogRotator"> |
174 | <daysToKeep>90</daysToKeep> |
175 | <numToKeep>90</numToKeep> |
176 | @@ -35,7 +35,7 @@ |
177 | </triggers> |
178 | <concurrentBuild>false</concurrentBuild> |
179 | <builders> |
180 | - <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.25"> |
181 | + <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26"> |
182 | <configs> |
183 | <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig> |
184 | <configs> |
185 | @@ -74,7 +74,7 @@ |
186 | </builders> |
187 | <publishers/> |
188 | <buildWrappers> |
189 | - <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/> |
190 | + <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/> |
191 | <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3"> |
192 | <template>#${BUILD_NUMBER}</template> |
193 | </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter> |
194 | |
195 | === modified file 'deployment/jobs/scheduled_trigger_lint/config.xml' |
196 | --- deployment/jobs/scheduled_trigger_lint/config.xml 2015-01-20 23:12:35 +0000 |
197 | +++ deployment/jobs/scheduled_trigger_lint/config.xml 2015-07-09 21:20:32 +0000 |
198 | @@ -2,7 +2,7 @@ |
199 | <project> |
200 | <actions/> |
201 | <description>* Triggers lint check for all branches via branch_scanner job
 |
202 | -* Weekly on Sunday</description> |
203 | +* Daily</description> |
204 | <logRotator class="hudson.tasks.LogRotator"> |
205 | <daysToKeep>90</daysToKeep> |
206 | <numToKeep>90</numToKeep> |
207 | @@ -30,13 +30,12 @@ |
208 | <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> |
209 | <triggers> |
210 | <hudson.triggers.TimerTrigger> |
211 | - <spec>05 12 * * 0 |
212 | -05 00 * * 3</spec> |
213 | + <spec>15 00 * * *</spec> |
214 | </hudson.triggers.TimerTrigger> |
215 | </triggers> |
216 | <concurrentBuild>false</concurrentBuild> |
217 | <builders> |
218 | - <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.25"> |
219 | + <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26"> |
220 | <configs> |
221 | <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig> |
222 | <configs> |
223 | @@ -75,7 +74,7 @@ |
224 | </builders> |
225 | <publishers/> |
226 | <buildWrappers> |
227 | - <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/> |
228 | + <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/> |
229 | <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3"> |
230 | <template>#${BUILD_NUMBER}</template> |
231 | </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter> |
232 | |
233 | === modified file 'deployment/jobs/scheduled_trigger_mojo_charmhelper_upgrade_icehouse_precise/config.xml' |
234 | --- deployment/jobs/scheduled_trigger_mojo_charmhelper_upgrade_icehouse_precise/config.xml 2015-03-31 20:59:51 +0000 |
235 | +++ deployment/jobs/scheduled_trigger_mojo_charmhelper_upgrade_icehouse_precise/config.xml 2015-07-09 21:20:32 +0000 |
236 | @@ -16,8 +16,10 @@ |
237 | <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4"> |
238 | <maxConcurrentPerNode>1</maxConcurrentPerNode> |
239 | <maxConcurrentTotal>1</maxConcurrentTotal> |
240 | + <categories/> |
241 | <throttleEnabled>true</throttleEnabled> |
242 | <throttleOption>project</throttleOption> |
243 | + <configVersion>1</configVersion> |
244 | </hudson.plugins.throttleconcurrents.ThrottleJobProperty> |
245 | <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/> |
246 | </properties> |
247 | @@ -35,7 +37,7 @@ |
248 | </triggers> |
249 | <concurrentBuild>false</concurrentBuild> |
250 | <builders> |
251 | - <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.25"> |
252 | + <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26"> |
253 | <configs> |
254 | <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig> |
255 | <configs> |
256 | @@ -76,7 +78,7 @@ |
257 | </builders> |
258 | <publishers/> |
259 | <buildWrappers> |
260 | - <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/> |
261 | + <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/> |
262 | <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3"> |
263 | <template>#${BUILD_NUMBER}</template> |
264 | </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter> |
265 | |
266 | === modified file 'deployment/jobs/scheduled_trigger_mojo_charmhelper_upgrade_icehouse_trusty/config.xml' |
267 | --- deployment/jobs/scheduled_trigger_mojo_charmhelper_upgrade_icehouse_trusty/config.xml 2015-03-31 20:59:51 +0000 |
268 | +++ deployment/jobs/scheduled_trigger_mojo_charmhelper_upgrade_icehouse_trusty/config.xml 2015-07-09 21:20:32 +0000 |
269 | @@ -16,8 +16,10 @@ |
270 | <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4"> |
271 | <maxConcurrentPerNode>1</maxConcurrentPerNode> |
272 | <maxConcurrentTotal>1</maxConcurrentTotal> |
273 | + <categories/> |
274 | <throttleEnabled>true</throttleEnabled> |
275 | <throttleOption>project</throttleOption> |
276 | + <configVersion>1</configVersion> |
277 | </hudson.plugins.throttleconcurrents.ThrottleJobProperty> |
278 | <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/> |
279 | </properties> |
280 | @@ -35,7 +37,7 @@ |
281 | </triggers> |
282 | <concurrentBuild>false</concurrentBuild> |
283 | <builders> |
284 | - <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.25"> |
285 | + <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26"> |
286 | <configs> |
287 | <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig> |
288 | <configs> |
289 | @@ -76,7 +78,7 @@ |
290 | </builders> |
291 | <publishers/> |
292 | <buildWrappers> |
293 | - <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/> |
294 | + <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/> |
295 | <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3"> |
296 | <template>#${BUILD_NUMBER}</template> |
297 | </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter> |
298 | |
299 | === modified file 'deployment/jobs/scheduled_trigger_mojo_charmhelper_upgrade_kilo_vivid/config.xml' |
300 | --- deployment/jobs/scheduled_trigger_mojo_charmhelper_upgrade_kilo_vivid/config.xml 2015-03-31 20:59:51 +0000 |
301 | +++ deployment/jobs/scheduled_trigger_mojo_charmhelper_upgrade_kilo_vivid/config.xml 2015-07-09 21:20:32 +0000 |
302 | @@ -16,8 +16,10 @@ |
303 | <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4"> |
304 | <maxConcurrentPerNode>1</maxConcurrentPerNode> |
305 | <maxConcurrentTotal>1</maxConcurrentTotal> |
306 | + <categories/> |
307 | <throttleEnabled>true</throttleEnabled> |
308 | <throttleOption>project</throttleOption> |
309 | + <configVersion>1</configVersion> |
310 | </hudson.plugins.throttleconcurrents.ThrottleJobProperty> |
311 | <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/> |
312 | </properties> |
313 | @@ -35,7 +37,7 @@ |
314 | </triggers> |
315 | <concurrentBuild>false</concurrentBuild> |
316 | <builders> |
317 | - <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.25"> |
318 | + <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26"> |
319 | <configs> |
320 | <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig> |
321 | <configs> |
322 | @@ -76,7 +78,7 @@ |
323 | </builders> |
324 | <publishers/> |
325 | <buildWrappers> |
326 | - <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/> |
327 | + <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/> |
328 | <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3"> |
329 | <template>#${BUILD_NUMBER}</template> |
330 | </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter> |
331 | |
332 | === modified file 'deployment/jobs/scheduled_trigger_mojo_ha_phased_juno_trusty/config.xml' |
333 | --- deployment/jobs/scheduled_trigger_mojo_ha_phased_juno_trusty/config.xml 2015-03-31 20:59:51 +0000 |
334 | +++ deployment/jobs/scheduled_trigger_mojo_ha_phased_juno_trusty/config.xml 2015-07-09 21:20:32 +0000 |
335 | @@ -16,8 +16,10 @@ |
336 | <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4"> |
337 | <maxConcurrentPerNode>1</maxConcurrentPerNode> |
338 | <maxConcurrentTotal>1</maxConcurrentTotal> |
339 | + <categories/> |
340 | <throttleEnabled>true</throttleEnabled> |
341 | <throttleOption>project</throttleOption> |
342 | + <configVersion>1</configVersion> |
343 | </hudson.plugins.throttleconcurrents.ThrottleJobProperty> |
344 | <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/> |
345 | </properties> |
346 | @@ -35,7 +37,7 @@ |
347 | </triggers> |
348 | <concurrentBuild>false</concurrentBuild> |
349 | <builders> |
350 | - <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.25"> |
351 | + <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26"> |
352 | <configs> |
353 | <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig> |
354 | <configs> |
355 | @@ -76,7 +78,7 @@ |
356 | </builders> |
357 | <publishers/> |
358 | <buildWrappers> |
359 | - <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/> |
360 | + <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/> |
361 | <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3"> |
362 | <template>#${BUILD_NUMBER}</template> |
363 | </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter> |
364 | |
365 | === added directory 'deployment/jobs/scheduled_trigger_sourcedeploy_trusty_icehouse' |
366 | === added file 'deployment/jobs/scheduled_trigger_sourcedeploy_trusty_icehouse/config.xml' |
367 | --- deployment/jobs/scheduled_trigger_sourcedeploy_trusty_icehouse/config.xml 1970-01-01 00:00:00 +0000 |
368 | +++ deployment/jobs/scheduled_trigger_sourcedeploy_trusty_icehouse/config.xml 2015-07-09 21:20:32 +0000 |
369 | @@ -0,0 +1,124 @@ |
370 | +<?xml version='1.0' encoding='UTF-8'?> |
371 | +<project> |
372 | + <actions/> |
373 | + <description></description> |
374 | + <logRotator class="hudson.tasks.LogRotator"> |
375 | + <daysToKeep>90</daysToKeep> |
376 | + <numToKeep>90</numToKeep> |
377 | + <artifactDaysToKeep>-1</artifactDaysToKeep> |
378 | + <artifactNumToKeep>-1</artifactNumToKeep> |
379 | + </logRotator> |
380 | + <keepDependencies>false</keepDependencies> |
381 | + <properties> |
382 | + <hudson.model.ParametersDefinitionProperty> |
383 | + <parameterDefinitions> |
384 | + <hudson.model.StringParameterDefinition> |
385 | + <name>UBUNTU_RELEASE</name> |
386 | + <description></description> |
387 | + <defaultValue>trusty</defaultValue> |
388 | + </hudson.model.StringParameterDefinition> |
389 | + <hudson.model.StringParameterDefinition> |
390 | + <name>OPENSTACK_RELEASE</name> |
391 | + <description></description> |
392 | + <defaultValue>icehouse</defaultValue> |
393 | + </hudson.model.StringParameterDefinition> |
394 | + <hudson.model.StringParameterDefinition> |
395 | + <name>INSTALLATION_SOURCE</name> |
396 | + <description></description> |
397 | + <defaultValue>default</defaultValue> |
398 | + </hudson.model.StringParameterDefinition> |
399 | + <hudson.model.StringParameterDefinition> |
400 | + <name>CHARM_SET</name> |
401 | + <description></description> |
402 | + <defaultValue>bundles/source/next.yaml</defaultValue> |
403 | + </hudson.model.StringParameterDefinition> |
404 | + <hudson.model.StringParameterDefinition> |
405 | + <name>DISPLAY_NAME</name> |
406 | + <description></description> |
407 | + <defaultValue></defaultValue> |
408 | + </hudson.model.StringParameterDefinition> |
409 | + <hudson.model.BooleanParameterDefinition> |
410 | + <name>TEMPEST_SMOKE</name> |
411 | + <description></description> |
412 | + <defaultValue>true</defaultValue> |
413 | + </hudson.model.BooleanParameterDefinition> |
414 | + <hudson.model.StringParameterDefinition> |
415 | + <name>JUJU_SOURCE</name> |
416 | + <description></description> |
417 | + <defaultValue>ppa:juju/stable</defaultValue> |
418 | + </hudson.model.StringParameterDefinition> |
419 | + <hudson.model.StringParameterDefinition> |
420 | + <name>NO_POST_DESTROY</name> |
421 | + <description></description> |
422 | + <defaultValue></defaultValue> |
423 | + </hudson.model.StringParameterDefinition> |
424 | + </parameterDefinitions> |
425 | + </hudson.model.ParametersDefinitionProperty> |
426 | + <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22"> |
427 | + <autoRebuild>false</autoRebuild> |
428 | + </com.sonyericsson.rebuild.RebuildSettings> |
429 | + <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4"> |
430 | + <maxConcurrentPerNode>1</maxConcurrentPerNode> |
431 | + <maxConcurrentTotal>1</maxConcurrentTotal> |
432 | + <throttleEnabled>true</throttleEnabled> |
433 | + <throttleOption>project</throttleOption> |
434 | + </hudson.plugins.throttleconcurrents.ThrottleJobProperty> |
435 | + <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/> |
436 | + </properties> |
437 | + <scm class="hudson.scm.NullSCM"/> |
438 | + <assignedNode>x86_64 || slave || trusty-slave</assignedNode> |
439 | + <canRoam>false</canRoam> |
440 | + <disabled>false</disabled> |
441 | + <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding> |
442 | + <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> |
443 | + <triggers> |
444 | + <hudson.triggers.TimerTrigger> |
445 | + <spec>00 01 * * 0</spec> |
446 | + </hudson.triggers.TimerTrigger> |
447 | + </triggers> |
448 | + <concurrentBuild>false</concurrentBuild> |
449 | + <builders> |
450 | + <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26"> |
451 | + <configs> |
452 | + <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig> |
453 | + <configs> |
454 | + <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters> |
455 | + <properties>SCHEDULED_TRIGGER=TRUE</properties> |
456 | + </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters> |
457 | + </configs> |
458 | + <projects>git_deploy_with_deployer</projects> |
459 | + <condition>ALWAYS</condition> |
460 | + <triggerWithNoParameters>false</triggerWithNoParameters> |
461 | + <block> |
462 | + <buildStepFailureThreshold> |
463 | + <name>FAILURE</name> |
464 | + <ordinal>2</ordinal> |
465 | + <color>RED</color> |
466 | + <completeBuild>true</completeBuild> |
467 | + </buildStepFailureThreshold> |
468 | + <unstableThreshold> |
469 | + <name>UNSTABLE</name> |
470 | + <ordinal>1</ordinal> |
471 | + <color>YELLOW</color> |
472 | + <completeBuild>true</completeBuild> |
473 | + </unstableThreshold> |
474 | + <failureThreshold> |
475 | + <name>FAILURE</name> |
476 | + <ordinal>2</ordinal> |
477 | + <color>RED</color> |
478 | + <completeBuild>true</completeBuild> |
479 | + </failureThreshold> |
480 | + </block> |
481 | + <buildAllNodesWithLabel>false</buildAllNodesWithLabel> |
482 | + </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig> |
483 | + </configs> |
484 | + </hudson.plugins.parameterizedtrigger.TriggerBuilder> |
485 | + </builders> |
486 | + <publishers/> |
487 | + <buildWrappers> |
488 | + <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/> |
489 | + <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3"> |
490 | + <template>#${BUILD_NUMBER}</template> |
491 | + </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter> |
492 | + </buildWrappers> |
493 | +</project> |
494 | \ No newline at end of file |
495 | |
496 | === added directory 'deployment/jobs/scheduled_trigger_sourcedeploy_trusty_juno' |
497 | === added file 'deployment/jobs/scheduled_trigger_sourcedeploy_trusty_juno/config.xml' |
498 | --- deployment/jobs/scheduled_trigger_sourcedeploy_trusty_juno/config.xml 1970-01-01 00:00:00 +0000 |
499 | +++ deployment/jobs/scheduled_trigger_sourcedeploy_trusty_juno/config.xml 2015-07-09 21:20:32 +0000 |
500 | @@ -0,0 +1,124 @@ |
501 | +<?xml version='1.0' encoding='UTF-8'?> |
502 | +<project> |
503 | + <actions/> |
504 | + <description></description> |
505 | + <logRotator class="hudson.tasks.LogRotator"> |
506 | + <daysToKeep>90</daysToKeep> |
507 | + <numToKeep>90</numToKeep> |
508 | + <artifactDaysToKeep>-1</artifactDaysToKeep> |
509 | + <artifactNumToKeep>-1</artifactNumToKeep> |
510 | + </logRotator> |
511 | + <keepDependencies>false</keepDependencies> |
512 | + <properties> |
513 | + <hudson.model.ParametersDefinitionProperty> |
514 | + <parameterDefinitions> |
515 | + <hudson.model.StringParameterDefinition> |
516 | + <name>UBUNTU_RELEASE</name> |
517 | + <description></description> |
518 | + <defaultValue>trusty</defaultValue> |
519 | + </hudson.model.StringParameterDefinition> |
520 | + <hudson.model.StringParameterDefinition> |
521 | + <name>OPENSTACK_RELEASE</name> |
522 | + <description></description> |
523 | + <defaultValue>juno</defaultValue> |
524 | + </hudson.model.StringParameterDefinition> |
525 | + <hudson.model.StringParameterDefinition> |
526 | + <name>INSTALLATION_SOURCE</name> |
527 | + <description></description> |
528 | + <defaultValue>default</defaultValue> |
529 | + </hudson.model.StringParameterDefinition> |
530 | + <hudson.model.StringParameterDefinition> |
531 | + <name>CHARM_SET</name> |
532 | + <description></description> |
533 | + <defaultValue>bundles/source/next.yaml</defaultValue> |
534 | + </hudson.model.StringParameterDefinition> |
535 | + <hudson.model.StringParameterDefinition> |
536 | + <name>DISPLAY_NAME</name> |
537 | + <description></description> |
538 | + <defaultValue></defaultValue> |
539 | + </hudson.model.StringParameterDefinition> |
540 | + <hudson.model.BooleanParameterDefinition> |
541 | + <name>TEMPEST_SMOKE</name> |
542 | + <description></description> |
543 | + <defaultValue>true</defaultValue> |
544 | + </hudson.model.BooleanParameterDefinition> |
545 | + <hudson.model.StringParameterDefinition> |
546 | + <name>JUJU_SOURCE</name> |
547 | + <description></description> |
548 | + <defaultValue>ppa:juju/stable</defaultValue> |
549 | + </hudson.model.StringParameterDefinition> |
550 | + <hudson.model.StringParameterDefinition> |
551 | + <name>NO_POST_DESTROY</name> |
552 | + <description></description> |
553 | + <defaultValue></defaultValue> |
554 | + </hudson.model.StringParameterDefinition> |
555 | + </parameterDefinitions> |
556 | + </hudson.model.ParametersDefinitionProperty> |
557 | + <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22"> |
558 | + <autoRebuild>false</autoRebuild> |
559 | + </com.sonyericsson.rebuild.RebuildSettings> |
560 | + <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4"> |
561 | + <maxConcurrentPerNode>1</maxConcurrentPerNode> |
562 | + <maxConcurrentTotal>1</maxConcurrentTotal> |
563 | + <throttleEnabled>true</throttleEnabled> |
564 | + <throttleOption>project</throttleOption> |
565 | + </hudson.plugins.throttleconcurrents.ThrottleJobProperty> |
566 | + <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/> |
567 | + </properties> |
568 | + <scm class="hudson.scm.NullSCM"/> |
569 | + <assignedNode>x86_64 || slave || trusty-slave</assignedNode> |
570 | + <canRoam>false</canRoam> |
571 | + <disabled>false</disabled> |
572 | + <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding> |
573 | + <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> |
574 | + <triggers> |
575 | + <hudson.triggers.TimerTrigger> |
576 | + <spec>00 01 * * 0</spec> |
577 | + </hudson.triggers.TimerTrigger> |
578 | + </triggers> |
579 | + <concurrentBuild>false</concurrentBuild> |
580 | + <builders> |
581 | + <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26"> |
582 | + <configs> |
583 | + <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig> |
584 | + <configs> |
585 | + <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters> |
586 | + <properties>SCHEDULED_TRIGGER=TRUE</properties> |
587 | + </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters> |
588 | + </configs> |
589 | + <projects>git_deploy_with_deployer</projects> |
590 | + <condition>ALWAYS</condition> |
591 | + <triggerWithNoParameters>false</triggerWithNoParameters> |
592 | + <block> |
593 | + <buildStepFailureThreshold> |
594 | + <name>FAILURE</name> |
595 | + <ordinal>2</ordinal> |
596 | + <color>RED</color> |
597 | + <completeBuild>true</completeBuild> |
598 | + </buildStepFailureThreshold> |
599 | + <unstableThreshold> |
600 | + <name>UNSTABLE</name> |
601 | + <ordinal>1</ordinal> |
602 | + <color>YELLOW</color> |
603 | + <completeBuild>true</completeBuild> |
604 | + </unstableThreshold> |
605 | + <failureThreshold> |
606 | + <name>FAILURE</name> |
607 | + <ordinal>2</ordinal> |
608 | + <color>RED</color> |
609 | + <completeBuild>true</completeBuild> |
610 | + </failureThreshold> |
611 | + </block> |
612 | + <buildAllNodesWithLabel>false</buildAllNodesWithLabel> |
613 | + </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig> |
614 | + </configs> |
615 | + </hudson.plugins.parameterizedtrigger.TriggerBuilder> |
616 | + </builders> |
617 | + <publishers/> |
618 | + <buildWrappers> |
619 | + <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/> |
620 | + <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3"> |
621 | + <template>#${BUILD_NUMBER}</template> |
622 | + </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter> |
623 | + </buildWrappers> |
624 | +</project> |
625 | \ No newline at end of file |
626 | |
627 | === added directory 'deployment/jobs/scheduled_trigger_sourcedeploy_trusty_kilo' |
628 | === added file 'deployment/jobs/scheduled_trigger_sourcedeploy_trusty_kilo/config.xml' |
629 | --- deployment/jobs/scheduled_trigger_sourcedeploy_trusty_kilo/config.xml 1970-01-01 00:00:00 +0000 |
630 | +++ deployment/jobs/scheduled_trigger_sourcedeploy_trusty_kilo/config.xml 2015-07-09 21:20:32 +0000 |
631 | @@ -0,0 +1,124 @@ |
632 | +<?xml version='1.0' encoding='UTF-8'?> |
633 | +<project> |
634 | + <actions/> |
635 | + <description></description> |
636 | + <logRotator class="hudson.tasks.LogRotator"> |
637 | + <daysToKeep>90</daysToKeep> |
638 | + <numToKeep>90</numToKeep> |
639 | + <artifactDaysToKeep>-1</artifactDaysToKeep> |
640 | + <artifactNumToKeep>-1</artifactNumToKeep> |
641 | + </logRotator> |
642 | + <keepDependencies>false</keepDependencies> |
643 | + <properties> |
644 | + <hudson.model.ParametersDefinitionProperty> |
645 | + <parameterDefinitions> |
646 | + <hudson.model.StringParameterDefinition> |
647 | + <name>UBUNTU_RELEASE</name> |
648 | + <description></description> |
649 | + <defaultValue>trusty</defaultValue> |
650 | + </hudson.model.StringParameterDefinition> |
651 | + <hudson.model.StringParameterDefinition> |
652 | + <name>OPENSTACK_RELEASE</name> |
653 | + <description></description> |
654 | + <defaultValue>kilo</defaultValue> |
655 | + </hudson.model.StringParameterDefinition> |
656 | + <hudson.model.StringParameterDefinition> |
657 | + <name>INSTALLATION_SOURCE</name> |
658 | + <description></description> |
659 | + <defaultValue>default</defaultValue> |
660 | + </hudson.model.StringParameterDefinition> |
661 | + <hudson.model.StringParameterDefinition> |
662 | + <name>CHARM_SET</name> |
663 | + <description></description> |
664 | + <defaultValue>bundles/source/next.yaml</defaultValue> |
665 | + </hudson.model.StringParameterDefinition> |
666 | + <hudson.model.StringParameterDefinition> |
667 | + <name>DISPLAY_NAME</name> |
668 | + <description></description> |
669 | + <defaultValue></defaultValue> |
670 | + </hudson.model.StringParameterDefinition> |
671 | + <hudson.model.BooleanParameterDefinition> |
672 | + <name>TEMPEST_SMOKE</name> |
673 | + <description></description> |
674 | + <defaultValue>true</defaultValue> |
675 | + </hudson.model.BooleanParameterDefinition> |
676 | + <hudson.model.StringParameterDefinition> |
677 | + <name>JUJU_SOURCE</name> |
678 | + <description></description> |
679 | + <defaultValue>ppa:juju/stable</defaultValue> |
680 | + </hudson.model.StringParameterDefinition> |
681 | + <hudson.model.StringParameterDefinition> |
682 | + <name>NO_POST_DESTROY</name> |
683 | + <description></description> |
684 | + <defaultValue></defaultValue> |
685 | + </hudson.model.StringParameterDefinition> |
686 | + </parameterDefinitions> |
687 | + </hudson.model.ParametersDefinitionProperty> |
688 | + <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22"> |
689 | + <autoRebuild>false</autoRebuild> |
690 | + </com.sonyericsson.rebuild.RebuildSettings> |
691 | + <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4"> |
692 | + <maxConcurrentPerNode>1</maxConcurrentPerNode> |
693 | + <maxConcurrentTotal>1</maxConcurrentTotal> |
694 | + <throttleEnabled>true</throttleEnabled> |
695 | + <throttleOption>project</throttleOption> |
696 | + </hudson.plugins.throttleconcurrents.ThrottleJobProperty> |
697 | + <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/> |
698 | + </properties> |
699 | + <scm class="hudson.scm.NullSCM"/> |
700 | + <assignedNode>x86_64 || slave || trusty-slave</assignedNode> |
701 | + <canRoam>false</canRoam> |
702 | + <disabled>false</disabled> |
703 | + <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding> |
704 | + <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> |
705 | + <triggers> |
706 | + <hudson.triggers.TimerTrigger> |
707 | + <spec>00 01 * * 0</spec> |
708 | + </hudson.triggers.TimerTrigger> |
709 | + </triggers> |
710 | + <concurrentBuild>false</concurrentBuild> |
711 | + <builders> |
712 | + <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26"> |
713 | + <configs> |
714 | + <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig> |
715 | + <configs> |
716 | + <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters> |
717 | + <properties>SCHEDULED_TRIGGER=TRUE</properties> |
718 | + </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters> |
719 | + </configs> |
720 | + <projects>git_deploy_with_deployer</projects> |
721 | + <condition>ALWAYS</condition> |
722 | + <triggerWithNoParameters>false</triggerWithNoParameters> |
723 | + <block> |
724 | + <buildStepFailureThreshold> |
725 | + <name>FAILURE</name> |
726 | + <ordinal>2</ordinal> |
727 | + <color>RED</color> |
728 | + <completeBuild>true</completeBuild> |
729 | + </buildStepFailureThreshold> |
730 | + <unstableThreshold> |
731 | + <name>UNSTABLE</name> |
732 | + <ordinal>1</ordinal> |
733 | + <color>YELLOW</color> |
734 | + <completeBuild>true</completeBuild> |
735 | + </unstableThreshold> |
736 | + <failureThreshold> |
737 | + <name>FAILURE</name> |
738 | + <ordinal>2</ordinal> |
739 | + <color>RED</color> |
740 | + <completeBuild>true</completeBuild> |
741 | + </failureThreshold> |
742 | + </block> |
743 | + <buildAllNodesWithLabel>false</buildAllNodesWithLabel> |
744 | + </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig> |
745 | + </configs> |
746 | + </hudson.plugins.parameterizedtrigger.TriggerBuilder> |
747 | + </builders> |
748 | + <publishers/> |
749 | + <buildWrappers> |
750 | + <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/> |
751 | + <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3"> |
752 | + <template>#${BUILD_NUMBER}</template> |
753 | + </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter> |
754 | + </buildWrappers> |
755 | +</project> |
756 | \ No newline at end of file |
757 | |
758 | === added directory 'deployment/jobs/scheduled_trigger_sourcedeploy_trusty_master' |
759 | === added file 'deployment/jobs/scheduled_trigger_sourcedeploy_trusty_master/config.xml' |
760 | --- deployment/jobs/scheduled_trigger_sourcedeploy_trusty_master/config.xml 1970-01-01 00:00:00 +0000 |
761 | +++ deployment/jobs/scheduled_trigger_sourcedeploy_trusty_master/config.xml 2015-07-09 21:20:32 +0000 |
762 | @@ -0,0 +1,124 @@ |
763 | +<?xml version='1.0' encoding='UTF-8'?> |
764 | +<project> |
765 | + <actions/> |
766 | + <description></description> |
767 | + <logRotator class="hudson.tasks.LogRotator"> |
768 | + <daysToKeep>90</daysToKeep> |
769 | + <numToKeep>90</numToKeep> |
770 | + <artifactDaysToKeep>-1</artifactDaysToKeep> |
771 | + <artifactNumToKeep>-1</artifactNumToKeep> |
772 | + </logRotator> |
773 | + <keepDependencies>false</keepDependencies> |
774 | + <properties> |
775 | + <hudson.model.ParametersDefinitionProperty> |
776 | + <parameterDefinitions> |
777 | + <hudson.model.StringParameterDefinition> |
778 | + <name>UBUNTU_RELEASE</name> |
779 | + <description></description> |
780 | + <defaultValue>trusty</defaultValue> |
781 | + </hudson.model.StringParameterDefinition> |
782 | + <hudson.model.StringParameterDefinition> |
783 | + <name>OPENSTACK_RELEASE</name> |
784 | + <description></description> |
785 | + <defaultValue>master</defaultValue> |
786 | + </hudson.model.StringParameterDefinition> |
787 | + <hudson.model.StringParameterDefinition> |
788 | + <name>INSTALLATION_SOURCE</name> |
789 | + <description></description> |
790 | + <defaultValue>default</defaultValue> |
791 | + </hudson.model.StringParameterDefinition> |
792 | + <hudson.model.StringParameterDefinition> |
793 | + <name>CHARM_SET</name> |
794 | + <description></description> |
795 | + <defaultValue>bundles/source/next.yaml</defaultValue> |
796 | + </hudson.model.StringParameterDefinition> |
797 | + <hudson.model.StringParameterDefinition> |
798 | + <name>DISPLAY_NAME</name> |
799 | + <description></description> |
800 | + <defaultValue></defaultValue> |
801 | + </hudson.model.StringParameterDefinition> |
802 | + <hudson.model.BooleanParameterDefinition> |
803 | + <name>TEMPEST_SMOKE</name> |
804 | + <description></description> |
805 | + <defaultValue>true</defaultValue> |
806 | + </hudson.model.BooleanParameterDefinition> |
807 | + <hudson.model.StringParameterDefinition> |
808 | + <name>JUJU_SOURCE</name> |
809 | + <description></description> |
810 | + <defaultValue>ppa:juju/stable</defaultValue> |
811 | + </hudson.model.StringParameterDefinition> |
812 | + <hudson.model.StringParameterDefinition> |
813 | + <name>NO_POST_DESTROY</name> |
814 | + <description></description> |
815 | + <defaultValue></defaultValue> |
816 | + </hudson.model.StringParameterDefinition> |
817 | + </parameterDefinitions> |
818 | + </hudson.model.ParametersDefinitionProperty> |
819 | + <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22"> |
820 | + <autoRebuild>false</autoRebuild> |
821 | + </com.sonyericsson.rebuild.RebuildSettings> |
822 | + <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4"> |
823 | + <maxConcurrentPerNode>1</maxConcurrentPerNode> |
824 | + <maxConcurrentTotal>1</maxConcurrentTotal> |
825 | + <throttleEnabled>true</throttleEnabled> |
826 | + <throttleOption>project</throttleOption> |
827 | + </hudson.plugins.throttleconcurrents.ThrottleJobProperty> |
828 | + <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/> |
829 | + </properties> |
830 | + <scm class="hudson.scm.NullSCM"/> |
831 | + <assignedNode>x86_64 || slave || trusty-slave</assignedNode> |
832 | + <canRoam>false</canRoam> |
833 | + <disabled>false</disabled> |
834 | + <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding> |
835 | + <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> |
836 | + <triggers> |
837 | + <hudson.triggers.TimerTrigger> |
838 | + <spec>00 01 * * *</spec> |
839 | + </hudson.triggers.TimerTrigger> |
840 | + </triggers> |
841 | + <concurrentBuild>false</concurrentBuild> |
842 | + <builders> |
843 | + <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26"> |
844 | + <configs> |
845 | + <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig> |
846 | + <configs> |
847 | + <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters> |
848 | + <properties>SCHEDULED_TRIGGER=TRUE</properties> |
849 | + </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters> |
850 | + </configs> |
851 | + <projects>git_deploy_with_deployer</projects> |
852 | + <condition>ALWAYS</condition> |
853 | + <triggerWithNoParameters>false</triggerWithNoParameters> |
854 | + <block> |
855 | + <buildStepFailureThreshold> |
856 | + <name>FAILURE</name> |
857 | + <ordinal>2</ordinal> |
858 | + <color>RED</color> |
859 | + <completeBuild>true</completeBuild> |
860 | + </buildStepFailureThreshold> |
861 | + <unstableThreshold> |
862 | + <name>UNSTABLE</name> |
863 | + <ordinal>1</ordinal> |
864 | + <color>YELLOW</color> |
865 | + <completeBuild>true</completeBuild> |
866 | + </unstableThreshold> |
867 | + <failureThreshold> |
868 | + <name>FAILURE</name> |
869 | + <ordinal>2</ordinal> |
870 | + <color>RED</color> |
871 | + <completeBuild>true</completeBuild> |
872 | + </failureThreshold> |
873 | + </block> |
874 | + <buildAllNodesWithLabel>false</buildAllNodesWithLabel> |
875 | + </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig> |
876 | + </configs> |
877 | + </hudson.plugins.parameterizedtrigger.TriggerBuilder> |
878 | + </builders> |
879 | + <publishers/> |
880 | + <buildWrappers> |
881 | + <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/> |
882 | + <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3"> |
883 | + <template>#${BUILD_NUMBER}</template> |
884 | + </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter> |
885 | + </buildWrappers> |
886 | +</project> |
887 | \ No newline at end of file |
888 | |
889 | === modified file 'deployment/jobs/scheduled_trigger_unit/config.xml' |
890 | --- deployment/jobs/scheduled_trigger_unit/config.xml 2015-05-17 14:36:21 +0000 |
891 | +++ deployment/jobs/scheduled_trigger_unit/config.xml 2015-07-09 21:20:32 +0000 |
892 | @@ -2,7 +2,7 @@ |
893 | <project> |
894 | <actions/> |
895 | <description>* Triggers unit tests for all branches via branch_scanner job
 |
896 | -* Weekly on Sunday</description> |
897 | +* Daily</description> |
898 | <logRotator class="hudson.tasks.LogRotator"> |
899 | <daysToKeep>90</daysToKeep> |
900 | <numToKeep>90</numToKeep> |
901 | @@ -30,8 +30,7 @@ |
902 | <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> |
903 | <triggers> |
904 | <hudson.triggers.TimerTrigger> |
905 | - <spec>05 12 * * 0 |
906 | -05 00 * * 3</spec> |
907 | + <spec>15 00 * * *</spec> |
908 | </hudson.triggers.TimerTrigger> |
909 | </triggers> |
910 | <concurrentBuild>false</concurrentBuild> |
911 | |
912 | === added file 'dev/mappings-dev.yaml' |
913 | --- dev/mappings-dev.yaml 1970-01-01 00:00:00 +0000 |
914 | +++ dev/mappings-dev.yaml 2015-07-09 21:20:32 +0000 |
915 | @@ -0,0 +1,237 @@ |
916 | +# save for feature development |
917 | + |
918 | + |
919 | +# the openstack version which shipped with an ubuntu release |
920 | +# not used by OSCI code yet |
921 | +release-map: |
922 | + precise: essex |
923 | + trusty: icehouse |
924 | + utopic: juno |
925 | + vivid: kilo |
926 | + wily: liberty |
927 | + |
928 | +# openstack versions available to ubuntu releases via ubuntu cloudarchives |
929 | +# not used by OSCI code yet |
930 | +uca-map: |
931 | + precise: |
932 | + - icehouse |
933 | + trusty: |
934 | + - juno |
935 | + - vivid |
936 | + - liberty |
937 | + |
938 | +# openstack installation sources |
939 | +# not used by OSCI code yet |
940 | +installation-sources: |
941 | + - default |
942 | + - proposed |
943 | + - trunk |
944 | + |
945 | + |
946 | +# |
947 | +# Groups of [specs x iterations] to run when triggered by a jenkins job calling |
948 | +# XYZFUTURE SCRIPT, # which will throw parameter iterations at the mojo_runner |
949 | +# resulting in a series of parameterized builds. |
950 | +mojo-trigger-groups: |
951 | + # named group; all iterations within will be triggered |
952 | + mojo-charm-helper-upgrade: |
953 | + # build name base |
954 | + ch-up-i: |
955 | + MOJO_SPEC: specs/full_stack/charmhelper_upgrade/icehouse |
956 | + # parameter(s) to pass; will trigger 1 build per parameter iteration group |
957 | + parameter-iteration: |
958 | + # key adds to build name (ex: ch-up-i-p) |
959 | + p: |
960 | + # pass one or more parameters to the build (everything is a string param here) |
961 | + # parameters become bash environment variables for jenkins |
962 | + # /!\ must take care to match expected/existing case; True != TRUE != true |
963 | + MOJO_SERIES: precise |
964 | + t: |
965 | + MOJO_SERIES: trusty |
966 | + ch-up-j: |
967 | + MOJO_SPEC: specs/full_stack/charmhelper_upgrade/juno |
968 | + parameter-iteration: |
969 | + t: |
970 | + MOJO_SERIES: trusty |
971 | +# enable/disable pieces as desired like so. also, can use multiple params |
972 | +# B: |
973 | +# MOJO_SERIES: bananas |
974 | +# branch: lp:treehouse |
975 | +# MP_SRC_BR: lp:treehouse/addition/next |
976 | +# JUJU_SOURCE: ppa:juju/devel |
977 | +# something: true |
978 | +# MOJO_OPENSTACK_SPECS_REPO: lp:some/other/branch |
979 | +# MPC_SILENT: True |
980 | + u: |
981 | + MOJO_SERIES: utopic |
982 | + ch-up-k: |
983 | + MOJO_SPEC: specs/full_stack/charmhelper_upgrade/kilo |
984 | + parameter-iteration: |
985 | + t: |
986 | + MOJO_SERIES: trusty |
987 | +# v: |
988 | +# MOJO_SERIES: vivid |
989 | + mojo-charm-helper-upgrade-ha: |
990 | + ch-up-i: |
991 | + MOJO_SPEC: specs/full_stack/charmhelper_upgrade_ha/icehouse |
992 | + parameter-iteration: |
993 | + p: |
994 | + MOJO_SERIES: precise |
995 | + t: |
996 | + MOJO_SERIES: trusty |
997 | + ch-up-j: |
998 | + MOJO_SPEC: specs/full_stack/charmhelper_upgrade_ha/juno |
999 | + parameter-iteration: |
1000 | + t: |
1001 | + MOJO_SERIES: trusty |
1002 | + u: |
1003 | + MOJO_SERIES: utopic |
1004 | + ch-up-k: |
1005 | + MOJO_SPEC: specs/full_stack/charmhelper_upgrade_ha/kilo |
1006 | + parameter-iteration: |
1007 | + t: |
1008 | + MOJO_SERIES: trusty |
1009 | +# v: |
1010 | +# MOJO_SERIES: vivid |
1011 | + mojo-next-ssl: |
1012 | + next-ssl-i: |
1013 | + MOJO_SPEC: specs/full_stack/next_deploy_ssl/icehouse |
1014 | + parameter-iteration: |
1015 | + p: |
1016 | + MOJO_SERIES: precise |
1017 | + t: |
1018 | + MOJO_SERIES: trusty |
1019 | + next-ssl-j: |
1020 | + MOJO_SPEC: specs/full_stack/next_deploy_ssl/juno |
1021 | + parameter-iteration: |
1022 | + t: |
1023 | + MOJO_SERIES: trusty |
1024 | + u: |
1025 | + MOJO_SERIES: utopic |
1026 | + next-ssl-k: |
1027 | + MOJO_SPEC: specs/full_stack/next_deploy_ssl/kilo |
1028 | + parameter-iteration: |
1029 | + t: |
1030 | + MOJO_SERIES: trusty |
1031 | +# v: |
1032 | +# MOJO_SERIES: vivid |
1033 | + mojo-stable-next-charm-upgrade: |
1034 | + stable-next-i: |
1035 | + MOJO_SPEC: specs/full_stack/stable_to_next/icehouse |
1036 | + parameter-iteration: |
1037 | + p: |
1038 | + MOJO_SERIES: precise |
1039 | + t: |
1040 | + MOJO_SERIES: trusty |
1041 | + stable-next-j: |
1042 | + MOJO_SPEC: specs/full_stack/stable_to_next/juno |
1043 | + parameter-iteration: |
1044 | + t: |
1045 | + MOJO_SERIES: trusty |
1046 | + u: |
1047 | + MOJO_SERIES: utopic |
1048 | + stable-next-k: |
1049 | + MOJO_SPEC: specs/full_stack/stable_to_next/kilo |
1050 | + parameter-iteration: |
1051 | + t: |
1052 | + MOJO_SERIES: trusty |
1053 | +# v: |
1054 | +# MOJO_SERIES: vivid |
1055 | + mojo-ha-phased: |
1056 | + ha-phased-i: |
1057 | + MOJO_SPEC: specs/full_stack/ha_phased/icehouse |
1058 | + parameter-iteration: |
1059 | + p: |
1060 | + MOJO_SERIES: precise |
1061 | + t: |
1062 | + MOJO_SERIES: trusty |
1063 | + ha-phased-j: |
1064 | + MOJO_SPEC: specs/full_stack/ha_phased/juno |
1065 | + parameter-iteration: |
1066 | + t: |
1067 | + MOJO_SERIES: trusty |
1068 | + u: |
1069 | + MOJO_SERIES: utopic |
1070 | + ha-phased-k: |
1071 | + MOJO_SPEC: specs/full_stack/ha_phased/kilo |
1072 | + parameter-iteration: |
1073 | + t: |
1074 | + MOJO_SERIES: trusty |
1075 | +# v: |
1076 | +# MOJO_SERIES: vivid |
1077 | + mojo-ha-phased-chaos-pony: |
1078 | + ha-phased-chaos-pony-i: |
1079 | + MOJO_SPEC: specs/full_stack/ha_phased_chaos_pony/icehouse |
1080 | + parameter-iteration: |
1081 | + p: |
1082 | + MOJO_SERIES: precise |
1083 | + t: |
1084 | + MOJO_SERIES: trusty |
1085 | + ha-phased-chaos-pony-j: |
1086 | + MOJO_SPEC: specs/full_stack/ha_phased_chaos_pony/juno |
1087 | + parameter-iteration: |
1088 | + t: |
1089 | + MOJO_SERIES: trusty |
1090 | + u: |
1091 | + MOJO_SERIES: utopic |
1092 | + ha-phased-chaos-pony-k: |
1093 | + MOJO_SPEC: specs/full_stack/ha_phased_chaos_pony/kilo |
1094 | + parameter-iteration: |
1095 | + t: |
1096 | + MOJO_SERIES: trusty |
1097 | +# v: |
1098 | +# MOJO_SERIES: vivid |
1099 | + mojo-next-deploy: |
1100 | + next-i: |
1101 | + MOJO_SPEC: specs/full_stack/next_deploy/icehouse |
1102 | + parameter-iteration: |
1103 | + p: |
1104 | + MOJO_SERIES: precise |
1105 | + t: |
1106 | + MOJO_SERIES: trusty |
1107 | + next-j: |
1108 | + MOJO_SPEC: specs/full_stack/next_deploy/juno |
1109 | + parameter-iteration: |
1110 | + t: |
1111 | + MOJO_SERIES: trusty |
1112 | + u: |
1113 | + MOJO_SERIES: utopic |
1114 | + next-k: |
1115 | + MOJO_SPEC: specs/full_stack/next_deploy/kilo |
1116 | + parameter-iteration: |
1117 | + t: |
1118 | + MOJO_SERIES: trusty |
1119 | +# v: |
1120 | +# MOJO_SERIES: vivid |
1121 | +url-trigger-groups: |
1122 | + jprop: |
1123 | + # juju proposed ppa contents watcher |
1124 | + state-file: 'url-state-jprop' |
1125 | + trigger-scripts: |
1126 | + # all will be triggered if any URL content changes |
1127 | + - build_bundle_quick_check.sh |
1128 | + - build_juju_deploy_single_charm.sh |
1129 | + - build_amulet_test.sh |
1130 | + - build_deploy_test.sh |
1131 | + urls: |
1132 | + - http://ppa.launchpad.net/juju/proposed/ubuntu/pool/main/j/juju-core/ |
1133 | + # and temp urls for increased testing of the tester: |
1134 | + - http://www.ubuntu.com |
1135 | + - http://irclogs.ubuntu.com/2015/02/26/%23juju-dev.html |
1136 | + - http://irclogs.ubuntu.com/2015/02/26/%23juju.html |
1137 | + - http://irclogs.ubuntu.com/2015/02/26/%23ubuntu-server.html |
1138 | + # likely to change hash on every load: |
1139 | + - https://code.launchpad.net/~uosci/ubuntu-openstack-ci/trunk |
1140 | + - https://launchpad.net/~1chb1n/+karma |
1141 | + enviro-vars: |
1142 | + # all will pass to all scripts |
1143 | + DISPLAY_NAME: jprop |
1144 | + MOJO_SERIES: trusty |
1145 | + UBUNTU_RELEASE: trusty |
1146 | + OPENSTACK_RELEASE: icehouse |
1147 | + INSTALLATION_SOURCE: default |
1148 | + CHARM_SET: next.yaml |
1149 | + TEMPEST_SMOKE: false |
1150 | + BASE_NAME: keystone |
1151 | + BRANCH: lp:~openstack-charmers/charms/trusty/keystone/next |
1152 | + JUJU_SOURCE: ppa:juju/proposed |
1153 | |
1154 | === modified file 'job-parts/osci_job_common.sh' |
1155 | --- job-parts/osci_job_common.sh 2015-07-08 13:50:46 +0000 |
1156 | +++ job-parts/osci_job_common.sh 2015-07-09 21:20:32 +0000 |
1157 | @@ -245,7 +245,7 @@ |
1158 | f_virtualenv |
1159 | |
1160 | # /!\ Temporary blacklist of amulet git tests |
1161 | -# rm -fv ${CO_DIR}/tests/05*git |
1162 | + rm -fv ${CO_DIR}/tests/05*git |
1163 | # /!\ |
1164 | |
1165 | # sstring array set by job |
1166 | |
1167 | === modified file 'populate/mappings.yaml' |
1168 | --- populate/mappings.yaml 2015-06-10 14:33:19 +0000 |
1169 | +++ populate/mappings.yaml 2015-07-09 21:20:32 +0000 |
1170 | @@ -32,46 +32,19 @@ |
1171 | # - 'Queued' |
1172 | # - 'Superseded' |
1173 | |
1174 | -# the openstack version which shipped with an ubuntu release |
1175 | -# not used by OSCI code yet |
1176 | -release-map: |
1177 | - precise: essex |
1178 | - trusty: icehouse |
1179 | - utopic: juno |
1180 | - vivid: kilo |
1181 | - |
1182 | -# openstack versions available to ubuntu releases via ubuntu cloudarchives |
1183 | -# not used by OSCI code yet |
1184 | -uca-map: |
1185 | - precise: |
1186 | - - icehouse |
1187 | - trusty: |
1188 | - - juno |
1189 | - - vivid |
1190 | - |
1191 | -# openstack installation sources |
1192 | -# not used by OSCI code yet |
1193 | -installation-sources: |
1194 | - - default |
1195 | - - proposed |
1196 | - - trunk |
1197 | - |
1198 | # branches to watch for revision bumps |
1199 | trigger-branches: |
1200 | - lp:~openstack-charmers/charms/trusty/ceilometer-agent/next |
1201 | - lp:~openstack-charmers/charms/trusty/ceilometer/next |
1202 | - lp:~openstack-charmers/charms/trusty/ceph/next |
1203 | - lp:~openstack-charmers/charms/trusty/ceph-osd/next |
1204 | -# this one is not used by next.yaml: |
1205 | - lp:~openstack-charmers/charms/trusty/ceph-radosgw/next |
1206 | - lp:~openstack-charmers/charms/trusty/cinder-ceph/next |
1207 | - lp:~openstack-charmers/charms/trusty/cinder/next |
1208 | - lp:~openstack-charmers/charms/trusty/glance/next |
1209 | -# this one is not used by next.yaml: |
1210 | - lp:~openstack-charmers/charms/trusty/hacluster/next |
1211 | - lp:~openstack-charmers/charms/trusty/heat/next |
1212 | - lp:~openstack-charmers/charms/trusty/keystone/next |
1213 | -# future add mysql to next? |
1214 | - lp:~openstack-charmers/charms/trusty/neutron-api/next |
1215 | - lp:~openstack-charmers/charms/trusty/neutron-openvswitch/next |
1216 | - lp:~openstack-charmers/charms/trusty/nova-cell/next |
1217 | @@ -83,11 +56,6 @@ |
1218 | - lp:~openstack-charmers/charms/trusty/rabbitmq-server/next |
1219 | - lp:~openstack-charmers/charms/trusty/swift-proxy/next |
1220 | - lp:~openstack-charmers/charms/trusty/swift-storage/next |
1221 | -# - lp:ubuntu-openstack-ci |
1222 | -# TODO: add hash tagging capability for overrides |
1223 | -# ie. no-depl no-lint no-amul no-unit |
1224 | -# - lp:ubuntu-openstack-ci#no-depl#no-amul |
1225 | -# |
1226 | - lp:charms/trusty/ceilometer |
1227 | - lp:charms/trusty/ceilometer-agent |
1228 | - lp:charms/trusty/ceph |
1229 | @@ -115,30 +83,28 @@ |
1230 | # deployment set to trigger when ANY trigger branch change is detected |
1231 | # in relation to deployer bundles in the openstack-charm-testing branch |
1232 | trigger-deployments: |
1233 | -# stable: |
1234 | default.yaml: |
1235 | -# Temporarily disable until 15.04 releases |
1236 | - precise-icehouse |
1237 | - trusty-icehouse |
1238 | - trusty-juno |
1239 | - trusty-kilo |
1240 | +# - trusty-liberty |
1241 | - utopic-juno |
1242 | - vivid-kilo |
1243 | -# development: |
1244 | +# - wily-liberty |
1245 | next.yaml: |
1246 | - precise-icehouse |
1247 | - trusty-icehouse |
1248 | - trusty-juno |
1249 | - trusty-kilo |
1250 | +# - trusty-liberty |
1251 | - utopic-juno |
1252 | - vivid-kilo |
1253 | -# 0mq.yaml: |
1254 | -# - trusty-icehouse-zmq |
1255 | +# - wily-liberty |
1256 | |
1257 | # deployment set to trigger based on merge proposals |
1258 | # the merge-proposed branch will be substituted for the target branch |
1259 | mp-trigger-deployments: |
1260 | -# development: |
1261 | next.yaml: |
1262 | - precise-icehouse |
1263 | - trusty-icehouse |
1264 | @@ -146,14 +112,14 @@ |
1265 | - trusty-kilo |
1266 | - utopic-juno |
1267 | - vivid-kilo |
1268 | -# stable: |
1269 | - default.yaml: |
1270 | - - precise-icehouse |
1271 | - - trusty-icehouse |
1272 | - - trusty-juno |
1273 | - - trusty-kilo |
1274 | - - utopic-juno |
1275 | - - vivid-kilo |
1276 | +# default.yaml: |
1277 | +# disabled as uosci runner only substitutes next branch strings currently |
1278 | +# - precise-icehouse |
1279 | +# - trusty-icehouse |
1280 | +# - trusty-juno |
1281 | +# - trusty-kilo |
1282 | +# - utopic-juno |
1283 | +# - vivid-kilo |
1284 | |
1285 | # controls pass/fail detection for MP commentary |
1286 | mp-trigger-tests: |
1287 | @@ -193,210 +159,3 @@ |
1288 | - 'fyi-depl.*.failed' |
1289 | - 'fyi-depl.*.missing' |
1290 | # - 'fyi-depl.*.bad' |
1291 | -# |
1292 | -# Groups of [specs x iterations] to run when triggered by a jenkins job calling |
1293 | -# XYZFUTURE SCRIPT, # which will throw parameter iterations at the mojo_runner |
1294 | -# resulting in a series of parameterized builds. |
1295 | -mojo-trigger-groups: |
1296 | - # named group; all iterations within will be triggered |
1297 | - mojo-charm-helper-upgrade: |
1298 | - # build name base |
1299 | - ch-up-i: |
1300 | - MOJO_SPEC: specs/full_stack/charmhelper_upgrade/icehouse |
1301 | - # parameter(s) to pass; will trigger 1 build per parameter iteration group |
1302 | - parameter-iteration: |
1303 | - # key adds to build name (ex: ch-up-i-p) |
1304 | - p: |
1305 | - # pass one or more parameters to the build (everything is a string param here) |
1306 | - # parameters become bash environment variables for jenkins |
1307 | - # /!\ must take care to match expected/existing case; True != TRUE != true |
1308 | - MOJO_SERIES: precise |
1309 | - t: |
1310 | - MOJO_SERIES: trusty |
1311 | - ch-up-j: |
1312 | - MOJO_SPEC: specs/full_stack/charmhelper_upgrade/juno |
1313 | - parameter-iteration: |
1314 | - t: |
1315 | - MOJO_SERIES: trusty |
1316 | -# enable/disable pieces as desired like so. also, can use multiple params |
1317 | -# B: |
1318 | -# MOJO_SERIES: bananas |
1319 | -# branch: lp:treehouse |
1320 | -# MP_SRC_BR: lp:treehouse/addition/next |
1321 | -# JUJU_SOURCE: ppa:juju/devel |
1322 | -# something: true |
1323 | -# MOJO_OPENSTACK_SPECS_REPO: lp:some/other/branch |
1324 | -# MPC_SILENT: True |
1325 | - u: |
1326 | - MOJO_SERIES: utopic |
1327 | - ch-up-k: |
1328 | - MOJO_SPEC: specs/full_stack/charmhelper_upgrade/kilo |
1329 | - parameter-iteration: |
1330 | - t: |
1331 | - MOJO_SERIES: trusty |
1332 | -# v: |
1333 | -# MOJO_SERIES: vivid |
1334 | - mojo-charm-helper-upgrade-ha: |
1335 | - ch-up-i: |
1336 | - MOJO_SPEC: specs/full_stack/charmhelper_upgrade_ha/icehouse |
1337 | - parameter-iteration: |
1338 | - p: |
1339 | - MOJO_SERIES: precise |
1340 | - t: |
1341 | - MOJO_SERIES: trusty |
1342 | - ch-up-j: |
1343 | - MOJO_SPEC: specs/full_stack/charmhelper_upgrade_ha/juno |
1344 | - parameter-iteration: |
1345 | - t: |
1346 | - MOJO_SERIES: trusty |
1347 | - u: |
1348 | - MOJO_SERIES: utopic |
1349 | - ch-up-k: |
1350 | - MOJO_SPEC: specs/full_stack/charmhelper_upgrade_ha/kilo |
1351 | - parameter-iteration: |
1352 | - t: |
1353 | - MOJO_SERIES: trusty |
1354 | -# v: |
1355 | -# MOJO_SERIES: vivid |
1356 | - mojo-next-ssl: |
1357 | - next-ssl-i: |
1358 | - MOJO_SPEC: specs/full_stack/next_deploy_ssl/icehouse |
1359 | - parameter-iteration: |
1360 | - p: |
1361 | - MOJO_SERIES: precise |
1362 | - t: |
1363 | - MOJO_SERIES: trusty |
1364 | - next-ssl-j: |
1365 | - MOJO_SPEC: specs/full_stack/next_deploy_ssl/juno |
1366 | - parameter-iteration: |
1367 | - t: |
1368 | - MOJO_SERIES: trusty |
1369 | - u: |
1370 | - MOJO_SERIES: utopic |
1371 | - next-ssl-k: |
1372 | - MOJO_SPEC: specs/full_stack/next_deploy_ssl/kilo |
1373 | - parameter-iteration: |
1374 | - t: |
1375 | - MOJO_SERIES: trusty |
1376 | -# v: |
1377 | -# MOJO_SERIES: vivid |
1378 | - mojo-stable-next-charm-upgrade: |
1379 | - stable-next-i: |
1380 | - MOJO_SPEC: specs/full_stack/stable_to_next/icehouse |
1381 | - parameter-iteration: |
1382 | - p: |
1383 | - MOJO_SERIES: precise |
1384 | - t: |
1385 | - MOJO_SERIES: trusty |
1386 | - stable-next-j: |
1387 | - MOJO_SPEC: specs/full_stack/stable_to_next/juno |
1388 | - parameter-iteration: |
1389 | - t: |
1390 | - MOJO_SERIES: trusty |
1391 | - u: |
1392 | - MOJO_SERIES: utopic |
1393 | - stable-next-k: |
1394 | - MOJO_SPEC: specs/full_stack/stable_to_next/kilo |
1395 | - parameter-iteration: |
1396 | - t: |
1397 | - MOJO_SERIES: trusty |
1398 | -# v: |
1399 | -# MOJO_SERIES: vivid |
1400 | - mojo-ha-phased: |
1401 | - ha-phased-i: |
1402 | - MOJO_SPEC: specs/full_stack/ha_phased/icehouse |
1403 | - parameter-iteration: |
1404 | - p: |
1405 | - MOJO_SERIES: precise |
1406 | - t: |
1407 | - MOJO_SERIES: trusty |
1408 | - ha-phased-j: |
1409 | - MOJO_SPEC: specs/full_stack/ha_phased/juno |
1410 | - parameter-iteration: |
1411 | - t: |
1412 | - MOJO_SERIES: trusty |
1413 | - u: |
1414 | - MOJO_SERIES: utopic |
1415 | - ha-phased-k: |
1416 | - MOJO_SPEC: specs/full_stack/ha_phased/kilo |
1417 | - parameter-iteration: |
1418 | - t: |
1419 | - MOJO_SERIES: trusty |
1420 | -# v: |
1421 | -# MOJO_SERIES: vivid |
1422 | - mojo-ha-phased-chaos-pony: |
1423 | - ha-phased-chaos-pony-i: |
1424 | - MOJO_SPEC: specs/full_stack/ha_phased_chaos_pony/icehouse |
1425 | - parameter-iteration: |
1426 | - p: |
1427 | - MOJO_SERIES: precise |
1428 | - t: |
1429 | - MOJO_SERIES: trusty |
1430 | - ha-phased-chaos-pony-j: |
1431 | - MOJO_SPEC: specs/full_stack/ha_phased_chaos_pony/juno |
1432 | - parameter-iteration: |
1433 | - t: |
1434 | - MOJO_SERIES: trusty |
1435 | - u: |
1436 | - MOJO_SERIES: utopic |
1437 | - ha-phased-chaos-pony-k: |
1438 | - MOJO_SPEC: specs/full_stack/ha_phased_chaos_pony/kilo |
1439 | - parameter-iteration: |
1440 | - t: |
1441 | - MOJO_SERIES: trusty |
1442 | -# v: |
1443 | -# MOJO_SERIES: vivid |
1444 | - mojo-next-deploy: |
1445 | - next-i: |
1446 | - MOJO_SPEC: specs/full_stack/next_deploy/icehouse |
1447 | - parameter-iteration: |
1448 | - p: |
1449 | - MOJO_SERIES: precise |
1450 | - t: |
1451 | - MOJO_SERIES: trusty |
1452 | - next-j: |
1453 | - MOJO_SPEC: specs/full_stack/next_deploy/juno |
1454 | - parameter-iteration: |
1455 | - t: |
1456 | - MOJO_SERIES: trusty |
1457 | - u: |
1458 | - MOJO_SERIES: utopic |
1459 | - next-k: |
1460 | - MOJO_SPEC: specs/full_stack/next_deploy/kilo |
1461 | - parameter-iteration: |
1462 | - t: |
1463 | - MOJO_SERIES: trusty |
1464 | -# v: |
1465 | -# MOJO_SERIES: vivid |
1466 | -url-trigger-groups: |
1467 | - jprop: |
1468 | - # juju proposed ppa contents watcher |
1469 | - state-file: 'url-state-jprop' |
1470 | - trigger-scripts: |
1471 | - # all will be triggered if any URL content changes |
1472 | - - build_bundle_quick_check.sh |
1473 | - - build_juju_deploy_single_charm.sh |
1474 | - - build_amulet_test.sh |
1475 | - - build_deploy_test.sh |
1476 | - urls: |
1477 | - - http://ppa.launchpad.net/juju/proposed/ubuntu/pool/main/j/juju-core/ |
1478 | - # and temp urls for increased testing of the tester: |
1479 | - - http://www.ubuntu.com |
1480 | - - http://irclogs.ubuntu.com/2015/02/26/%23juju-dev.html |
1481 | - - http://irclogs.ubuntu.com/2015/02/26/%23juju.html |
1482 | - - http://irclogs.ubuntu.com/2015/02/26/%23ubuntu-server.html |
1483 | - # likely to change hash on every load: |
1484 | - - https://code.launchpad.net/~uosci/ubuntu-openstack-ci/trunk |
1485 | - - https://launchpad.net/~1chb1n/+karma |
1486 | - enviro-vars: |
1487 | - # all will pass to all scripts |
1488 | - DISPLAY_NAME: jprop |
1489 | - MOJO_SERIES: trusty |
1490 | - UBUNTU_RELEASE: trusty |
1491 | - OPENSTACK_RELEASE: icehouse |
1492 | - INSTALLATION_SOURCE: default |
1493 | - CHARM_SET: next.yaml |
1494 | - TEMPEST_SMOKE: false |
1495 | - BASE_NAME: keystone |
1496 | - BRANCH: lp:~openstack-charmers/charms/trusty/keystone/next |
1497 | - JUJU_SOURCE: ppa:juju/proposed |
1498 | |
1499 | === modified file 'scan_merge_props.py' |
1500 | --- scan_merge_props.py 2015-05-01 13:03:11 +0000 |
1501 | +++ scan_merge_props.py 2015-07-09 21:20:32 +0000 |
1502 | @@ -123,7 +123,7 @@ |
1503 | 'src-branch-last-mod': str(src_branch.date_last_modified), |
1504 | 'created': str(mp.date_created), |
1505 | 'merged': str(mp.date_merged), |
1506 | -# 'queued': str(mp.date_queued), |
1507 | + #'queued': str(mp.date_queued), |
1508 | 'requested': str(mp.date_review_requested), |
1509 | 'reviewed': str(mp.date_reviewed) |
1510 | } |