ubuntu-openstack-ci

Merge lp:~1chb1n/ubuntu-openstack-ci/demo into lp:ubuntu-openstack-ci

  1. demo
  2. Merge into trunk
Proposed by Ryan Beisner
Status: Merged
Merged at revision: 141
Proposed branch: lp:~1chb1n/ubuntu-openstack-ci/demo
Merge into: lp:ubuntu-openstack-ci
Diff against target: 1150 lines (+529/-67)
22 files modified
deployment/bin/106-pip-index-set.sh (+27/-0)
deployment/deploy-files/config.xml.global (+2/-0)
deployment/deploy-files/config.xml.views (+48/-3)
deployment/deploy-files/pip.conf (+2/-0)
deployment/jobs/charm_amulet_test/config.xml (+13/-8)
deployment/jobs/deploy_openstack/config.xml (+4/-4)
deployment/jobs/deploy_with_deployer/config.xml (+3/-3)
deployment/jobs/deployer_quick_check/config.xml (+5/-4)
deployment/jobs/git-watch/config.xml (+112/-0)
deployment/jobs/git_deploy_with_deployer/config.xml (+107/-0)
deployment/jobs/manual_deploy_single_charm/config.xml (+5/-6)
deployment/jobs/manual_trigger_deploy_with_deployer/config.xml (+6/-2)
deployment/jobs/mojo_runner/config.xml (+3/-3)
deployment/jobs/mojo_runner_baremetal/config.xml (+40/-15)
deployment/jobs/scheduled_trigger_unit/config.xml (+3/-3)
deployment/jobs/trigger_by_branch_scanner/config.xml (+6/-6)
deployment/jobs/trigger_by_mp_scanner/config.xml (+7/-7)
job-parts/build_amulet_test.sh (+1/-1)
job-parts/build_deployer_quickcheck.sh (+5/-0)
job-parts/build_git_deploy_test.sh (+76/-0)
job-parts/osci_job_common.sh (+7/-2)
job-parts/osci_openstack_common.sh (+47/-0)
To merge this branch: bzr merge lp:~1chb1n/ubuntu-openstack-ci/demo
Reviewer Review Type Date Requested Status
Ubuntu OpenStack CI Team Pending
Review via email: mp+258892@code.launchpad.net

Commit message

devpi mirror usage; gui floating ip pieces.

Description of the change

devpi mirror usage; gui floating ip pieces.

To post a comment you must log in.
lp:~1chb1n/ubuntu-openstack-ci/demo updated
146. By Ryan Beisner

update

147. By Ryan Beisner

update

148. By Ryan Beisner

add bundletester make target detection for amulet tests

149. By Ryan Beisner

update

150. By Ryan Beisner

add gui float and git deployer demo

151. By Ryan Beisner

update

152. By Ryan Beisner

update jobs, views

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'deployment/bin/106-pip-index-set.sh'
2--- deployment/bin/106-pip-index-set.sh 1970-01-01 00:00:00 +0000
3+++ deployment/bin/106-pip-index-set.sh 2015-05-17 14:36:39 +0000
4@@ -0,0 +1,27 @@
5+#!/bin/bash -e
6+echo $0
7+
8+# Copy pip conf to jenkins user home on master and all slaves
9+
10+. $(dirname $0)/../../env-common
11+
12+f_dst_dir="${JENKINS_HOME}/.pip"
13+f_dst="${f_dst_dir}/pip.conf"
14+f_tmp="${U_HOME}/pip.conf"
15+f_src="deploy-files/pip.conf"
16+
17+mkdirs="sudo mkdir -vp ${f_dst}"
18+
19+# Set master and slaves
20+for unit in $UNITS; do
21+ # copy pip conf onto units
22+ juju scp $f_src ${unit}:${f_tmp}
23+ juju ssh ${unit} "sudo mkdir -vp ${f_dst_dir} &&\
24+ sudo cp -f ${f_tmp} ${f_dst} &&\
25+ sudo chown jenkins:jenkins -R ${f_dst_dir}"
26+done
27+
28+# Example:
29+# Set in $HOME/.pip/pip.conf
30+#[global]
31+#index-url = http://10.245.162.102:3141/root/pypi/+simple/
32
33=== modified file 'deployment/deploy-files/config.xml.global'
34--- deployment/deploy-files/config.xml.global 2014-10-17 14:15:17 +0000
35+++ deployment/deploy-files/config.xml.global 2015-05-17 14:36:39 +0000
36@@ -33,6 +33,8 @@
37 <string>/var/lib/jenkins/tools/tarmac</string>
38 <string>USER</string>
39 <string>jenkins</string>
40+ <string>OSCI_NO_PROXY</string>
41+ <string>localhost,127.0.0.1,10.245.162.102</string>
42 </tree-map>
43 </envVars>
44 </hudson.slaves.EnvironmentVariablesNodeProperty>
45
46=== modified file 'deployment/deploy-files/config.xml.views'
47--- deployment/deploy-files/config.xml.views 2015-03-31 20:59:51 +0000
48+++ deployment/deploy-files/config.xml.views 2015-05-17 14:36:39 +0000
49@@ -160,6 +160,7 @@
50 <jobNames>
51 <comparator class="hudson.util.CaseInsensitiveComparator" reference="../../../../../hudson.plugins.nested__view.NestedView/views/listView[4]/jobNames/comparator"/>
52 <string>deploy_with_deployer</string>
53+ <string>git_deploy_with_deployer</string>
54 </jobNames>
55 <jobFilters/>
56 <columns>
57@@ -177,12 +178,17 @@
58 <leftPortletWidth>50%</leftPortletWidth>
59 <rightPortletWidth>50%</rightPortletWidth>
60 <leftPortlets/>
61- <rightPortlets/>
62+ <rightPortlets>
63+ <hudson.plugins.view.dashboard.stats.StatSlaves>
64+ <id>dashboard_portlet_30206</id>
65+ <name>Slaves statistics</name>
66+ </hudson.plugins.view.dashboard.stats.StatSlaves>
67+ </rightPortlets>
68 <topPortlets>
69 <hudson.plugins.view.dashboard.builds.LatestBuilds>
70- <id>dashboard_portlet_31421</id>
71+ <id>dashboard_portlet_31016</id>
72 <name>Latest builds</name>
73- <numBuilds>250</numBuilds>
74+ <numBuilds>500</numBuilds>
75 </hudson.plugins.view.dashboard.builds.LatestBuilds>
76 </topPortlets>
77 <bottomPortlets/>
78@@ -332,6 +338,43 @@
79 </topPortlets>
80 <bottomPortlets/>
81 </hudson.plugins.view.dashboard.Dashboard>
82+ <hudson.plugins.view.dashboard.Dashboard plugin="dashboard-view@2.9.4">
83+ <owner class="hudson.plugins.nested_view.NestedView" reference="../../.."/>
84+ <name>Git</name>
85+ <filterExecutors>false</filterExecutors>
86+ <filterQueue>false</filterQueue>
87+ <properties class="hudson.model.View$PropertyList"/>
88+ <jobNames>
89+ <comparator class="hudson.util.CaseInsensitiveComparator"/>
90+ <string>git-watch</string>
91+ <string>git_deploy_with_deployer</string>
92+ </jobNames>
93+ <jobFilters/>
94+ <columns>
95+ <hudson.views.StatusColumn/>
96+ <hudson.views.WeatherColumn/>
97+ <hudson.views.JobColumn/>
98+ <hudson.views.LastSuccessColumn/>
99+ <hudson.views.LastFailureColumn/>
100+ <hudson.views.LastDurationColumn/>
101+ <hudson.views.BuildButtonColumn/>
102+ </columns>
103+ <recurse>false</recurse>
104+ <useCssStyle>false</useCssStyle>
105+ <includeStdJobList>false</includeStdJobList>
106+ <leftPortletWidth>50%</leftPortletWidth>
107+ <rightPortletWidth>50%</rightPortletWidth>
108+ <leftPortlets/>
109+ <rightPortlets/>
110+ <topPortlets>
111+ <hudson.plugins.view.dashboard.builds.LatestBuilds>
112+ <id>dashboard_portlet_17989</id>
113+ <name>Latest builds</name>
114+ <numBuilds>500</numBuilds>
115+ </hudson.plugins.view.dashboard.builds.LatestBuilds>
116+ </topPortlets>
117+ <bottomPortlets/>
118+ </hudson.plugins.view.dashboard.Dashboard>
119 </views>
120 <defaultView>OpenStack Deploy</defaultView>
121 <columns>
122@@ -387,6 +430,8 @@
123 <properties class="hudson.model.View$PropertyList"/>
124 <jobNames>
125 <comparator class="hudson.util.CaseInsensitiveComparator" reference="../../../hudson.plugins.nested__view.NestedView/views/listView[4]/jobNames/comparator"/>
126+ <string>git-watch</string>
127+ <string>git_deploy_with_deployer</string>
128 <string>mojo_runner_baremetal</string>
129 <string>scheduled_trigger_mojo_charmhelper_upgrade_icehouse_precise</string>
130 <string>scheduled_trigger_mojo_ha_phased_juno_trusty</string>
131
132=== added file 'deployment/deploy-files/pip.conf'
133--- deployment/deploy-files/pip.conf 1970-01-01 00:00:00 +0000
134+++ deployment/deploy-files/pip.conf 2015-05-17 14:36:39 +0000
135@@ -0,0 +1,2 @@
136+[global]
137+index-url = http://10.245.162.102:3141/root/pypi/+simple/
138
139=== modified file 'deployment/jobs/charm_amulet_test/config.xml'
140--- deployment/jobs/charm_amulet_test/config.xml 2015-03-31 20:59:51 +0000
141+++ deployment/jobs/charm_amulet_test/config.xml 2015-05-17 14:36:39 +0000
142@@ -16,12 +16,12 @@
143 <parameterDefinitions>
144 <hudson.model.StringParameterDefinition>
145 <name>BASE_NAME</name>
146- <description>The charm or project&apos;s real name (ie. keystone).</description>
147+ <description>The charm or project&apos;s real base name (ie. keystone).</description>
148 <defaultValue>manual</defaultValue>
149 </hudson.model.StringParameterDefinition>
150 <hudson.model.StringParameterDefinition>
151 <name>DISPLAY_NAME</name>
152- <description>Affects build description.</description>
153+ <description>Affects build description, whatever you want.</description>
154 <defaultValue>manual</defaultValue>
155 </hudson.model.StringParameterDefinition>
156 <hudson.model.StringParameterDefinition>
157@@ -31,25 +31,30 @@
158 </hudson.model.StringParameterDefinition>
159 <hudson.model.StringParameterDefinition>
160 <name>MP_TRIGGER</name>
161- <description></description>
162+ <description>Optional for merge proposal handling.</description>
163 <defaultValue></defaultValue>
164 </hudson.model.StringParameterDefinition>
165 <hudson.model.StringParameterDefinition>
166 <name>MP_TGT_BR</name>
167- <description></description>
168+ <description>Merge proposal target branch. Optional for merge proposal handling.</description>
169 <defaultValue></defaultValue>
170 </hudson.model.StringParameterDefinition>
171 <hudson.model.StringParameterDefinition>
172 <name>MP_SRC_BR</name>
173- <description></description>
174+ <description>Merge proposal source branch. Optional for merge proposal handling.</description>
175 <defaultValue></defaultValue>
176 </hudson.model.StringParameterDefinition>
177 <hudson.model.StringParameterDefinition>
178 <name>JUJU_SOURCE</name>
179- <description></description>
180+ <description>Defaults to ppa:juju/stable if empty.</description>
181 <defaultValue></defaultValue>
182 </hudson.model.StringParameterDefinition>
183 <hudson.model.BooleanParameterDefinition>
184+ <name>CHARMHELPER_SYNC</name>
185+ <description>Run make sync on the checkout to update charmhelpers before the test/deploy.</description>
186+ <defaultValue>false</defaultValue>
187+ </hudson.model.BooleanParameterDefinition>
188+ <hudson.model.BooleanParameterDefinition>
189 <name>NO_POST_DESTROY</name>
190 <description>Set true to skip destroy after a FAILED test. Amulet will tear down all successful runs, regardless of this setting. Note that the enviro will most likely be torn down by the next job!</description>
191 <defaultValue>false</defaultValue>
192@@ -90,14 +95,14 @@
193 <fingerprint>false</fingerprint>
194 <defaultExcludes>true</defaultExcludes>
195 </hudson.tasks.ArtifactArchiver>
196- <hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.9">
197+ <hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.10">
198 <regexp>_:.*</regexp>
199 <regexpForFailed>_:.*</regexpForFailed>
200 <setForMatrix>false</setForMatrix>
201 </hudson.plugins.descriptionsetter.DescriptionSetterPublisher>
202 </publishers>
203 <buildWrappers>
204- <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/>
205+ <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
206 <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
207 <template>#${BUILD_NUMBER} ${ENV,var=&quot;DISPLAY_NAME&quot;}</template>
208 </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
209
210=== modified file 'deployment/jobs/deploy_openstack/config.xml'
211--- deployment/jobs/deploy_openstack/config.xml 2015-02-05 22:19:52 +0000
212+++ deployment/jobs/deploy_openstack/config.xml 2015-05-17 14:36:39 +0000
213@@ -86,7 +86,7 @@
214 </com.sonyericsson.rebuild.RebuildSettings>
215 <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
216 <maxConcurrentPerNode>1</maxConcurrentPerNode>
217- <maxConcurrentTotal>3</maxConcurrentTotal>
218+ <maxConcurrentTotal>1</maxConcurrentTotal>
219 <throttleEnabled>true</throttleEnabled>
220 <throttleOption>project</throttleOption>
221 </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
222@@ -105,7 +105,7 @@
223 <command>#!/bin/bash -e
224 ${OSCI_ROOT}/job-parts/part_workspace_cleanup.sh</command>
225 </hudson.tasks.Shell>
226- <hudson.plugins.copyartifact.CopyArtifact plugin="copyartifact@1.33">
227+ <hudson.plugins.copyartifact.CopyArtifact plugin="copyartifact@1.35">
228 <project>manual_trigger_deploy_with_deployer</project>
229 <filter>custom-other.yaml</filter>
230 <target></target>
231@@ -128,14 +128,14 @@
232 <fingerprint>false</fingerprint>
233 <defaultExcludes>true</defaultExcludes>
234 </hudson.tasks.ArtifactArchiver>
235- <hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.9">
236+ <hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.10">
237 <regexp>_:.*</regexp>
238 <regexpForFailed>_:.*</regexpForFailed>
239 <setForMatrix>false</setForMatrix>
240 </hudson.plugins.descriptionsetter.DescriptionSetterPublisher>
241 </publishers>
242 <buildWrappers>
243- <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.15"/>
244+ <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
245 <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
246 <template>#${BUILD_NUMBER} ${ENV,var=&quot;UBUNTU_RELEASE&quot;}-${ENV,var=&quot;OPENSTACK_RELEASE&quot;}-${ENV,var=&quot;INSTALLATION_SOURCE&quot;}-${ENV,var=&quot;CHARM_SET&quot;} ${ENV,var=&quot;DISPLAY_NAME&quot;}</template>
247 </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
248
249=== modified file 'deployment/jobs/deploy_with_deployer/config.xml'
250--- deployment/jobs/deploy_with_deployer/config.xml 2015-03-31 20:59:51 +0000
251+++ deployment/jobs/deploy_with_deployer/config.xml 2015-05-17 14:36:39 +0000
252@@ -107,7 +107,7 @@
253 <command>#!/bin/bash -e
254 ${OSCI_ROOT}/job-parts/part_workspace_cleanup.sh</command>
255 </hudson.tasks.Shell>
256- <hudson.plugins.copyartifact.CopyArtifact plugin="copyartifact@1.32.1">
257+ <hudson.plugins.copyartifact.CopyArtifact plugin="copyartifact@1.35">
258 <project>manual_trigger_deploy_with_deployer</project>
259 <filter>custom-other.yaml</filter>
260 <target></target>
261@@ -130,14 +130,14 @@
262 <fingerprint>false</fingerprint>
263 <defaultExcludes>true</defaultExcludes>
264 </hudson.tasks.ArtifactArchiver>
265- <hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.9">
266+ <hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.10">
267 <regexp>_:.*</regexp>
268 <regexpForFailed>_:.*</regexpForFailed>
269 <setForMatrix>false</setForMatrix>
270 </hudson.plugins.descriptionsetter.DescriptionSetterPublisher>
271 </publishers>
272 <buildWrappers>
273- <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/>
274+ <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
275 <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
276 <template>#${BUILD_NUMBER} ${ENV,var=&quot;UBUNTU_RELEASE&quot;}-${ENV,var=&quot;OPENSTACK_RELEASE&quot;}-${ENV,var=&quot;INSTALLATION_SOURCE&quot;}-${ENV,var=&quot;CHARM_SET&quot;} ${ENV,var=&quot;DISPLAY_NAME&quot;}</template>
277 </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
278
279=== modified file 'deployment/jobs/deployer_quick_check/config.xml'
280--- deployment/jobs/deployer_quick_check/config.xml 2015-03-31 20:59:51 +0000
281+++ deployment/jobs/deployer_quick_check/config.xml 2015-05-17 14:36:39 +0000
282@@ -19,7 +19,6 @@
283 <string>ALL (no restriction)</string>
284 </allowedSlaves>
285 <defaultSlaves>
286- <string>master</string>
287 <string>osci-slave-0</string>
288 <string>osci-slave-1</string>
289 <string>osci-slave-10</string>
290@@ -68,8 +67,10 @@
291 <choices class="java.util.Arrays$ArrayList">
292 <a class="string-array">
293 <string>bundles/other/ubuntu3.yaml</string>
294+ <string>bundles/other/ubuntu3-dev.yaml</string>
295 <string>bundles/other/mediawikijoompress.yaml</string>
296 <string>bundles/other/ubuntu3-lxc.yaml</string>
297+ <string>bundles/dev/mysql-scale.yaml</string>
298 <string>#bundles/other/deployer-quick-check.yaml</string>
299 </a>
300 </choices>
301@@ -81,7 +82,7 @@
302 <a class="string-array">
303 <string>trusty</string>
304 <string>utopic</string>
305- <string>kilo</string>
306+ <string>vivid</string>
307 <string>precise</string>
308 <string>#for openstack-oriented bundles:</string>
309 <string>trusty-icehouse</string>
310@@ -135,14 +136,14 @@
311 <fingerprint>false</fingerprint>
312 <defaultExcludes>true</defaultExcludes>
313 </hudson.tasks.ArtifactArchiver>
314- <hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.9">
315+ <hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.10">
316 <regexp>_:.*</regexp>
317 <regexpForFailed>_:.*</regexpForFailed>
318 <setForMatrix>false</setForMatrix>
319 </hudson.plugins.descriptionsetter.DescriptionSetterPublisher>
320 </publishers>
321 <buildWrappers>
322- <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/>
323+ <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
324 <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
325 <template>#${BUILD_NUMBER} ${ENV,var=&quot;BUNDLE_FILE&quot;} ${ENV,var=&quot;BUNDLE_TARGET&quot;} ${ENV,var=&quot;DISPLAY_NAME&quot;}</template>
326 </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
327
328=== added directory 'deployment/jobs/git-watch'
329=== added file 'deployment/jobs/git-watch/config.xml'
330--- deployment/jobs/git-watch/config.xml 1970-01-01 00:00:00 +0000
331+++ deployment/jobs/git-watch/config.xml 2015-05-17 14:36:39 +0000
332@@ -0,0 +1,112 @@
333+<?xml version='1.0' encoding='UTF-8'?>
334+<project>
335+ <actions/>
336+ <description>Watches and triggers when commits hit any of these:&#xd;
337+https://github.com/coreycb/neutron&#xd;
338+https://github.com/coreycb/horizon&#xd;
339+https://git.launchpad.net/~corey.bryant/+git/horizon&#xd;
340+https://github.com/ryan-beisner/trigger-test</description>
341+ <logRotator class="hudson.tasks.LogRotator">
342+ <daysToKeep>7</daysToKeep>
343+ <numToKeep>500</numToKeep>
344+ <artifactDaysToKeep>-1</artifactDaysToKeep>
345+ <artifactNumToKeep>-1</artifactNumToKeep>
346+ </logRotator>
347+ <keepDependencies>false</keepDependencies>
348+ <properties>
349+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22">
350+ <autoRebuild>false</autoRebuild>
351+ </com.sonyericsson.rebuild.RebuildSettings>
352+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
353+ <maxConcurrentPerNode>1</maxConcurrentPerNode>
354+ <maxConcurrentTotal>1</maxConcurrentTotal>
355+ <throttleEnabled>true</throttleEnabled>
356+ <throttleOption>project</throttleOption>
357+ </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
358+ <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
359+ </properties>
360+ <scm class="hudson.plugins.git.GitSCM" plugin="git@2.3.5">
361+ <configVersion>2</configVersion>
362+ <userRemoteConfigs>
363+ <hudson.plugins.git.UserRemoteConfig>
364+ <url>https://github.com/coreycb/neutron</url>
365+ </hudson.plugins.git.UserRemoteConfig>
366+ <hudson.plugins.git.UserRemoteConfig>
367+ <url>https://github.com/ryan-beisner/trigger-test</url>
368+ </hudson.plugins.git.UserRemoteConfig>
369+ <hudson.plugins.git.UserRemoteConfig>
370+ <url>https://github.com/coreycb/horizon</url>
371+ </hudson.plugins.git.UserRemoteConfig>
372+ <hudson.plugins.git.UserRemoteConfig>
373+ <url>https://git.launchpad.net/~corey.bryant/+git/horizon</url>
374+ </hudson.plugins.git.UserRemoteConfig>
375+ </userRemoteConfigs>
376+ <branches>
377+ <hudson.plugins.git.BranchSpec>
378+ <name>*/master</name>
379+ </hudson.plugins.git.BranchSpec>
380+ </branches>
381+ <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
382+ <submoduleCfg class="list"/>
383+ <extensions/>
384+ </scm>
385+ <canRoam>true</canRoam>
386+ <disabled>false</disabled>
387+ <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
388+ <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
389+ <triggers>
390+ <hudson.triggers.SCMTrigger>
391+ <spec>*/5 * * * *</spec>
392+ <ignorePostCommitHooks>false</ignorePostCommitHooks>
393+ </hudson.triggers.SCMTrigger>
394+ </triggers>
395+ <concurrentBuild>false</concurrentBuild>
396+ <builders>
397+ <org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder plugin="conditional-buildstep@1.3.3">
398+ <condition class="org.jenkins_ci.plugins.run_condition.core.CauseCondition" plugin="run-condition@1.0">
399+ <buildCause>SCM_CAUSE</buildCause>
400+ <exclusiveCause>false</exclusiveCause>
401+ </condition>
402+ <buildStep class="hudson.tasks.Shell">
403+ <command>#!/bin/bash -e
404+echo HELLO, CONDITIONALLY.
405+echo _:scm.changed</command>
406+ </buildStep>
407+ <runner class="org.jenkins_ci.plugins.run_condition.BuildStepRunner$Fail" plugin="run-condition@1.0"/>
408+ </org.jenkinsci.plugins.conditionalbuildstep.singlestep.SingleConditionalBuilder>
409+ <hudson.tasks.Shell>
410+ <command>#!/bin/bash -e
411+echo HELLO, ALWAYS.</command>
412+ </hudson.tasks.Shell>
413+ <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26">
414+ <configs>
415+ <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
416+ <configs class="empty-list"/>
417+ <projects>git_deploy_with_deployer</projects>
418+ <condition>ALWAYS</condition>
419+ <triggerWithNoParameters>false</triggerWithNoParameters>
420+ <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
421+ </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
422+ </configs>
423+ </hudson.plugins.parameterizedtrigger.TriggerBuilder>
424+ </builders>
425+ <publishers>
426+ <hudson.tasks.ArtifactArchiver>
427+ <artifacts>*</artifacts>
428+ <allowEmptyArchive>true</allowEmptyArchive>
429+ <onlyIfSuccessful>false</onlyIfSuccessful>
430+ <fingerprint>false</fingerprint>
431+ <defaultExcludes>true</defaultExcludes>
432+ </hudson.tasks.ArtifactArchiver>
433+ <hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.10">
434+ <regexp>_:scm.changed</regexp>
435+ <regexpForFailed>_:scm.changed</regexpForFailed>
436+ <description>TRIGGERING</description>
437+ <descriptionForFailed>TRIGGERING</descriptionForFailed>
438+ <setForMatrix>false</setForMatrix>
439+ </hudson.plugins.descriptionsetter.DescriptionSetterPublisher>
440+ </publishers>
441+ <buildWrappers>
442+ <org.jenkinsci.plugins.builduser.BuildUser plugin="build-user-vars-plugin@1.4"/>
443+ </buildWrappers>
444+</project>
445\ No newline at end of file
446
447=== added directory 'deployment/jobs/git_deploy_with_deployer'
448=== added file 'deployment/jobs/git_deploy_with_deployer/config.xml'
449--- deployment/jobs/git_deploy_with_deployer/config.xml 1970-01-01 00:00:00 +0000
450+++ deployment/jobs/git_deploy_with_deployer/config.xml 2015-05-17 14:36:39 +0000
451@@ -0,0 +1,107 @@
452+<?xml version='1.0' encoding='UTF-8'?>
453+<project>
454+ <actions/>
455+ <description></description>
456+ <logRotator class="hudson.tasks.LogRotator">
457+ <daysToKeep>100</daysToKeep>
458+ <numToKeep>100</numToKeep>
459+ <artifactDaysToKeep>45</artifactDaysToKeep>
460+ <artifactNumToKeep>500</artifactNumToKeep>
461+ </logRotator>
462+ <keepDependencies>false</keepDependencies>
463+ <properties>
464+ <hudson.model.ParametersDefinitionProperty>
465+ <parameterDefinitions>
466+ <hudson.model.StringParameterDefinition>
467+ <name>UBUNTU_RELEASE</name>
468+ <description></description>
469+ <defaultValue>trusty</defaultValue>
470+ </hudson.model.StringParameterDefinition>
471+ <hudson.model.StringParameterDefinition>
472+ <name>OPENSTACK_RELEASE</name>
473+ <description></description>
474+ <defaultValue>master</defaultValue>
475+ </hudson.model.StringParameterDefinition>
476+ <hudson.model.StringParameterDefinition>
477+ <name>INSTALLATION_SOURCE</name>
478+ <description></description>
479+ <defaultValue>proposed</defaultValue>
480+ </hudson.model.StringParameterDefinition>
481+ <hudson.model.StringParameterDefinition>
482+ <name>CHARM_SET</name>
483+ <description></description>
484+ <defaultValue>bundles/source/next.yaml</defaultValue>
485+ </hudson.model.StringParameterDefinition>
486+ <hudson.model.StringParameterDefinition>
487+ <name>DISPLAY_NAME</name>
488+ <description></description>
489+ <defaultValue></defaultValue>
490+ </hudson.model.StringParameterDefinition>
491+ <hudson.model.BooleanParameterDefinition>
492+ <name>TEMPEST_SMOKE</name>
493+ <description>Enable to run tempest smoke tests after deployment. Keep on by default.</description>
494+ <defaultValue>true</defaultValue>
495+ </hudson.model.BooleanParameterDefinition>
496+ <hudson.model.StringParameterDefinition>
497+ <name>JUJU_SOURCE</name>
498+ <description></description>
499+ <defaultValue>ppa:juju/stable</defaultValue>
500+ </hudson.model.StringParameterDefinition>
501+ <hudson.model.BooleanParameterDefinition>
502+ <name>NO_POST_DESTROY</name>
503+ <description>Set true to skip destroy after deployment. Note that the enviro will most likely be torn down by the next job!</description>
504+ <defaultValue>true</defaultValue>
505+ </hudson.model.BooleanParameterDefinition>
506+ </parameterDefinitions>
507+ </hudson.model.ParametersDefinitionProperty>
508+ <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22">
509+ <autoRebuild>false</autoRebuild>
510+ </com.sonyericsson.rebuild.RebuildSettings>
511+ <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
512+ <maxConcurrentPerNode>1</maxConcurrentPerNode>
513+ <maxConcurrentTotal>4</maxConcurrentTotal>
514+ <throttleEnabled>true</throttleEnabled>
515+ <throttleOption>project</throttleOption>
516+ </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
517+ <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
518+ </properties>
519+ <scm class="hudson.scm.NullSCM"/>
520+ <assignedNode>demo</assignedNode>
521+ <canRoam>false</canRoam>
522+ <disabled>false</disabled>
523+ <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
524+ <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
525+ <triggers/>
526+ <concurrentBuild>true</concurrentBuild>
527+ <builders>
528+ <hudson.tasks.Shell>
529+ <command>#!/bin/bash -e
530+${OSCI_ROOT}/job-parts/part_workspace_cleanup.sh</command>
531+ </hudson.tasks.Shell>
532+ <hudson.tasks.Shell>
533+ <command>#!/bin/bash -e
534+${OSCI_ROOT}/job-parts/build_git_deploy_test.sh
535+</command>
536+ </hudson.tasks.Shell>
537+ </builders>
538+ <publishers>
539+ <hudson.tasks.ArtifactArchiver>
540+ <artifacts>*, logs/*</artifacts>
541+ <allowEmptyArchive>false</allowEmptyArchive>
542+ <onlyIfSuccessful>false</onlyIfSuccessful>
543+ <fingerprint>false</fingerprint>
544+ <defaultExcludes>true</defaultExcludes>
545+ </hudson.tasks.ArtifactArchiver>
546+ <hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.10">
547+ <regexp>_:.*</regexp>
548+ <regexpForFailed>_:.*</regexpForFailed>
549+ <setForMatrix>false</setForMatrix>
550+ </hudson.plugins.descriptionsetter.DescriptionSetterPublisher>
551+ </publishers>
552+ <buildWrappers>
553+ <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
554+ <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
555+ <template>#${BUILD_NUMBER} ${ENV,var=&quot;UBUNTU_RELEASE&quot;}-${ENV,var=&quot;OPENSTACK_RELEASE&quot;}-${ENV,var=&quot;INSTALLATION_SOURCE&quot;}-${ENV,var=&quot;CHARM_SET&quot;} ${ENV,var=&quot;DISPLAY_NAME&quot;}</template>
556+ </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
557+ </buildWrappers>
558+</project>
559\ No newline at end of file
560
561=== modified file 'deployment/jobs/manual_deploy_single_charm/config.xml'
562--- deployment/jobs/manual_deploy_single_charm/config.xml 2015-02-05 22:19:52 +0000
563+++ deployment/jobs/manual_deploy_single_charm/config.xml 2015-05-17 14:36:39 +0000
564@@ -22,7 +22,6 @@
565 <string>ALL (no restriction)</string>
566 </allowedSlaves>
567 <defaultSlaves>
568- <string>master</string>
569 <string>osci-slave-0</string>
570 <string>osci-slave-1</string>
571 <string>osci-slave-10</string>
572@@ -113,9 +112,9 @@
573 <autoRebuild>false</autoRebuild>
574 </com.sonyericsson.rebuild.RebuildSettings>
575 <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
576- <maxConcurrentPerNode>0</maxConcurrentPerNode>
577- <maxConcurrentTotal>0</maxConcurrentTotal>
578- <throttleEnabled>false</throttleEnabled>
579+ <maxConcurrentPerNode>1</maxConcurrentPerNode>
580+ <maxConcurrentTotal>12</maxConcurrentTotal>
581+ <throttleEnabled>true</throttleEnabled>
582 <throttleOption>project</throttleOption>
583 </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
584 <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
585@@ -142,14 +141,14 @@
586 <fingerprint>false</fingerprint>
587 <defaultExcludes>true</defaultExcludes>
588 </hudson.tasks.ArtifactArchiver>
589- <hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.9">
590+ <hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.10">
591 <regexp>_:.*</regexp>
592 <regexpForFailed>_:.*</regexpForFailed>
593 <setForMatrix>false</setForMatrix>
594 </hudson.plugins.descriptionsetter.DescriptionSetterPublisher>
595 </publishers>
596 <buildWrappers>
597- <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/>
598+ <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
599 <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
600 <template>#${BUILD_NUMBER} ${ENV,var=&quot;THIS_CHARM_SELECT&quot;}${ENV,var=&quot;THIS_CHARM_TEXT&quot;} ${ENV,var=&quot;NODE_NAME&quot;}</template>
601 </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
602
603=== modified file 'deployment/jobs/manual_trigger_deploy_with_deployer/config.xml'
604--- deployment/jobs/manual_trigger_deploy_with_deployer/config.xml 2015-03-31 20:59:51 +0000
605+++ deployment/jobs/manual_trigger_deploy_with_deployer/config.xml 2015-05-17 14:36:39 +0000
606@@ -18,6 +18,7 @@
607 <description></description>
608 <choices class="java.util.Arrays$ArrayList">
609 <a class="string-array">
610+ <string>wily</string>
611 <string>vivid</string>
612 <string>utopic</string>
613 <string>trusty</string>
614@@ -30,6 +31,8 @@
615 <description></description>
616 <choices class="java.util.Arrays$ArrayList">
617 <a class="string-array">
618+ <string>master</string>
619+ <string>liberty</string>
620 <string>kilo</string>
621 <string>juno</string>
622 <string>icehouse</string>
623@@ -62,7 +65,8 @@
624 <string>default.yaml</string>
625 <string>next.yaml</string>
626 <string>custom-other.yaml</string>
627- <string>bundles/dev/next-kilo-testing.yaml</string>
628+ <string>bundles/source/next.yaml</string>
629+ <string>bundles/source/default.yaml</string>
630 <string>bundles/dev/ssl-everywhere.yaml</string>
631 <string>bundles/0mq/0mq.yaml</string>
632 <string>bundles/legacy/essex.yaml</string>
633@@ -129,7 +133,7 @@
634 <triggers/>
635 <concurrentBuild>true</concurrentBuild>
636 <builders>
637- <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.25">
638+ <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26">
639 <configs>
640 <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
641 <configs>
642
643=== modified file 'deployment/jobs/mojo_runner/config.xml'
644--- deployment/jobs/mojo_runner/config.xml 2015-03-31 20:59:51 +0000
645+++ deployment/jobs/mojo_runner/config.xml 2015-05-17 14:36:39 +0000
646@@ -57,7 +57,7 @@
647 </com.sonyericsson.rebuild.RebuildSettings>
648 <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
649 <maxConcurrentPerNode>1</maxConcurrentPerNode>
650- <maxConcurrentTotal>2</maxConcurrentTotal>
651+ <maxConcurrentTotal>1</maxConcurrentTotal>
652 <throttleEnabled>true</throttleEnabled>
653 <throttleOption>project</throttleOption>
654 </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
655@@ -86,14 +86,14 @@
656 <fingerprint>false</fingerprint>
657 <defaultExcludes>true</defaultExcludes>
658 </hudson.tasks.ArtifactArchiver>
659- <hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.9">
660+ <hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.10">
661 <regexp>_:.*</regexp>
662 <regexpForFailed>_:.*</regexpForFailed>
663 <setForMatrix>false</setForMatrix>
664 </hudson.plugins.descriptionsetter.DescriptionSetterPublisher>
665 </publishers>
666 <buildWrappers>
667- <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/>
668+ <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
669 <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
670 <template>#${BUILD_NUMBER} ${ENV,var=&quot;MOJO_SPEC&quot;} ${ENV,var=&quot;MOJO_SPEC_CUSTOM&quot;} ${ENV,var=&quot;MOJO_SERIES&quot;} ${ENV,var=&quot;DISPLAY_NAME&quot;}</template>
671 </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
672
673=== modified file 'deployment/jobs/mojo_runner_baremetal/config.xml'
674--- deployment/jobs/mojo_runner_baremetal/config.xml 2015-03-31 20:59:51 +0000
675+++ deployment/jobs/mojo_runner_baremetal/config.xml 2015-05-17 14:36:39 +0000
676@@ -3,7 +3,7 @@
677 <actions/>
678 <description>* For dellstack/baremetal only.&#xd;
679 * This is a runner/wrapper job for mojo specs.&#xd;
680-* Use the manual_trigger_mojo to initiate manual runs.</description>
681+</description>
682 <logRotator class="hudson.tasks.LogRotator">
683 <daysToKeep>60</daysToKeep>
684 <numToKeep>-1</numToKeep>
685@@ -19,27 +19,50 @@
686 <description>Optionally override with an arbitrary branch.</description>
687 <defaultValue>lp:~1chb1n/openstack-mojo-specs/baremetal-init</defaultValue>
688 </hudson.model.StringParameterDefinition>
689- <hudson.model.StringParameterDefinition>
690+ <hudson.model.ChoiceParameterDefinition>
691 <name>MOJO_SPEC</name>
692- <description>Value from selection list.
693-If you&apos;re trying to do a manual mojo run, use the manual_trigger_mojo job instead.</description>
694- <defaultValue>specs/full_stack/next_deploy_baremetal/icehouse</defaultValue>
695+ <description></description>
696+ <choices class="java.util.Arrays$ArrayList">
697+ <a class="string-array">
698+ <string>specs/full_stack/next_deploy_baremetal/icehouse</string>
699+ <string>specs/full_stack/next_deploy_baremetal/juno</string>
700+ <string>specs/full_stack/next_deploy_baremetal/kilo</string>
701+ </a>
702+ </choices>
703+ </hudson.model.ChoiceParameterDefinition>
704+ <hudson.model.StringParameterDefinition>
705+ <name>MOJO_SPEC_CUSTOM</name>
706+ <description></description>
707+ <defaultValue></defaultValue>
708 </hudson.model.StringParameterDefinition>
709- <hudson.model.StringParameterDefinition>
710+ <hudson.model.ChoiceParameterDefinition>
711 <name>MOJO_SERIES</name>
712 <description></description>
713- <defaultValue>trusty</defaultValue>
714- </hudson.model.StringParameterDefinition>
715+ <choices class="java.util.Arrays$ArrayList">
716+ <a class="string-array">
717+ <string>trusty</string>
718+ <string>precise</string>
719+ <string>utopic</string>
720+ <string>vivid</string>
721+ </a>
722+ </choices>
723+ </hudson.model.ChoiceParameterDefinition>
724 <hudson.model.StringParameterDefinition>
725 <name>DISPLAY_NAME</name>
726- <description>Optionally add text to be added to the build description.</description>
727+ <description>Add optional text to the build description.</description>
728 <defaultValue></defaultValue>
729 </hudson.model.StringParameterDefinition>
730- <hudson.model.StringParameterDefinition>
731+ <hudson.model.ChoiceParameterDefinition>
732 <name>JUJU_SOURCE</name>
733 <description></description>
734- <defaultValue>ppa:juju/stable</defaultValue>
735- </hudson.model.StringParameterDefinition>
736+ <choices class="java.util.Arrays$ArrayList">
737+ <a class="string-array">
738+ <string>ppa:juju/stable</string>
739+ <string>ppa:juju/proposed</string>
740+ <string>ppa:juju/devel</string>
741+ </a>
742+ </choices>
743+ </hudson.model.ChoiceParameterDefinition>
744 <hudson.model.BooleanParameterDefinition>
745 <name>NO_POST_DESTROY</name>
746 <description>Set true to skip destroy after deployment. Note that the slave environment will most likely be torn down by the next job! Take the slave node offline if you intend to do post-deployment manual poking.</description>
747@@ -53,15 +76,17 @@
748 <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
749 <maxConcurrentPerNode>1</maxConcurrentPerNode>
750 <maxConcurrentTotal>1</maxConcurrentTotal>
751+ <categories/>
752 <throttleEnabled>true</throttleEnabled>
753 <throttleOption>project</throttleOption>
754+ <configVersion>1</configVersion>
755 </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
756 <org.jvnet.hudson.plugins.shelveproject.ShelveProjectProperty plugin="shelve-project-plugin@1.5"/>
757 </properties>
758 <scm class="hudson.scm.NullSCM"/>
759 <assignedNode>dellstack</assignedNode>
760 <canRoam>false</canRoam>
761- <disabled>false</disabled>
762+ <disabled>true</disabled>
763 <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
764 <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
765 <triggers/>
766@@ -81,14 +106,14 @@
767 <fingerprint>false</fingerprint>
768 <defaultExcludes>true</defaultExcludes>
769 </hudson.tasks.ArtifactArchiver>
770- <hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.9">
771+ <hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.10">
772 <regexp>_:.*</regexp>
773 <regexpForFailed>_:.*</regexpForFailed>
774 <setForMatrix>false</setForMatrix>
775 </hudson.plugins.descriptionsetter.DescriptionSetterPublisher>
776 </publishers>
777 <buildWrappers>
778- <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/>
779+ <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
780 <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
781 <template>#${BUILD_NUMBER} ${ENV,var=&quot;MOJO_SPEC&quot;} ${ENV,var=&quot;MOJO_SPEC_CUSTOM&quot;} ${ENV,var=&quot;MOJO_SERIES&quot;} ${ENV,var=&quot;DISPLAY_NAME&quot;}</template>
782 </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
783
784=== modified file 'deployment/jobs/scheduled_trigger_unit/config.xml'
785--- deployment/jobs/scheduled_trigger_unit/config.xml 2015-01-20 23:12:35 +0000
786+++ deployment/jobs/scheduled_trigger_unit/config.xml 2015-05-17 14:36:39 +0000
787@@ -16,7 +16,7 @@
788 </com.sonyericsson.rebuild.RebuildSettings>
789 <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
790 <maxConcurrentPerNode>1</maxConcurrentPerNode>
791- <maxConcurrentTotal>1</maxConcurrentTotal>
792+ <maxConcurrentTotal>8</maxConcurrentTotal>
793 <throttleEnabled>true</throttleEnabled>
794 <throttleOption>project</throttleOption>
795 </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
796@@ -36,7 +36,7 @@
797 </triggers>
798 <concurrentBuild>false</concurrentBuild>
799 <builders>
800- <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.25">
801+ <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26">
802 <configs>
803 <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
804 <configs>
805@@ -75,7 +75,7 @@
806 </builders>
807 <publishers/>
808 <buildWrappers>
809- <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/>
810+ <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
811 <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
812 <template>#${BUILD_NUMBER}</template>
813 </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
814
815=== modified file 'deployment/jobs/trigger_by_branch_scanner/config.xml'
816--- deployment/jobs/trigger_by_branch_scanner/config.xml 2015-02-05 22:19:52 +0000
817+++ deployment/jobs/trigger_by_branch_scanner/config.xml 2015-05-17 14:36:39 +0000
818@@ -85,7 +85,7 @@
819 <command>#!/bin/bash -e
820 ${OSCI_ROOT}/job-parts/trigger_by_branch_scanner.sh</command>
821 </hudson.tasks.Shell>
822- <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.25">
823+ <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26">
824 <configs>
825 <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
826 <configs>
827@@ -104,7 +104,7 @@
828 </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
829 </configs>
830 </hudson.plugins.parameterizedtrigger.TriggerBuilder>
831- <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.25">
832+ <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26">
833 <configs>
834 <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
835 <configs>
836@@ -123,7 +123,7 @@
837 </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
838 </configs>
839 </hudson.plugins.parameterizedtrigger.TriggerBuilder>
840- <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.25">
841+ <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26">
842 <configs>
843 <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
844 <configs>
845@@ -142,7 +142,7 @@
846 </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
847 </configs>
848 </hudson.plugins.parameterizedtrigger.TriggerBuilder>
849- <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.25">
850+ <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26">
851 <configs>
852 <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
853 <configs>
854@@ -170,7 +170,7 @@
855 <fingerprint>false</fingerprint>
856 <defaultExcludes>true</defaultExcludes>
857 </hudson.tasks.ArtifactArchiver>
858- <hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.9">
859+ <hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.10">
860 <regexp>_:branch-state.changed</regexp>
861 <regexpForFailed></regexpForFailed>
862 <description>TRIGGERING</description>
863@@ -178,7 +178,7 @@
864 </hudson.plugins.descriptionsetter.DescriptionSetterPublisher>
865 </publishers>
866 <buildWrappers>
867- <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/>
868+ <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
869 <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
870 <template>#${BUILD_NUMBER} ${ENV,var=&quot;TRIGGER_FINGER&quot;}</template>
871 </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
872
873=== modified file 'deployment/jobs/trigger_by_mp_scanner/config.xml'
874--- deployment/jobs/trigger_by_mp_scanner/config.xml 2015-02-05 22:19:52 +0000
875+++ deployment/jobs/trigger_by_mp_scanner/config.xml 2015-05-17 14:36:39 +0000
876@@ -62,7 +62,7 @@
877 <scm class="hudson.scm.NullSCM"/>
878 <assignedNode>master</assignedNode>
879 <canRoam>false</canRoam>
880- <disabled>true</disabled>
881+ <disabled>false</disabled>
882 <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
883 <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
884 <triggers>
885@@ -76,7 +76,7 @@
886 <command>#!/bin/bash -ex
887 ${OSCI_ROOT}/job-parts/trigger_by_mp_scanner.sh</command>
888 </hudson.tasks.Shell>
889- <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.25">
890+ <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26">
891 <configs>
892 <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
893 <configs class="empty-list"/>
894@@ -93,7 +93,7 @@
895 </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
896 </configs>
897 </hudson.plugins.parameterizedtrigger.TriggerBuilder>
898- <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.25">
899+ <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26">
900 <configs>
901 <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
902 <configs class="empty-list"/>
903@@ -110,7 +110,7 @@
904 </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
905 </configs>
906 </hudson.plugins.parameterizedtrigger.TriggerBuilder>
907- <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.25">
908+ <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26">
909 <configs>
910 <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
911 <configs class="empty-list"/>
912@@ -127,7 +127,7 @@
913 </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
914 </configs>
915 </hudson.plugins.parameterizedtrigger.TriggerBuilder>
916- <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.25">
917+ <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.26">
918 <configs>
919 <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
920 <configs class="empty-list"/>
921@@ -162,7 +162,7 @@
922 <fingerprint>false</fingerprint>
923 <defaultExcludes>true</defaultExcludes>
924 </hudson.tasks.ArtifactArchiver>
925- <hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.9">
926+ <hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.10">
927 <regexp>_:mp-state.changed</regexp>
928 <regexpForFailed>_:mp-state.changed</regexpForFailed>
929 <description>TRIGGERING</description>
930@@ -171,7 +171,7 @@
931 </hudson.plugins.descriptionsetter.DescriptionSetterPublisher>
932 </publishers>
933 <buildWrappers>
934- <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/>
935+ <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.6"/>
936 <org.jenkinsci.plugins.buildnamesetter.BuildNameSetter plugin="build-name-setter@1.3">
937 <template>#${BUILD_NUMBER} ${ENV,var=&quot;TRIGGER_FINGER&quot;}</template>
938 </org.jenkinsci.plugins.buildnamesetter.BuildNameSetter>
939
940=== modified file 'job-parts/build_amulet_test.sh'
941--- job-parts/build_amulet_test.sh 2015-04-05 03:34:18 +0000
942+++ job-parts/build_amulet_test.sh 2015-05-17 14:36:39 +0000
943@@ -4,7 +4,7 @@
944
945 # Makefile command search strings, first match wins
946 sstring[0]="@juju test"
947-#sstring[1]=""
948+sstring[1]=".venv/bin/bundletester"
949 #sstring[2]=""
950 #sstring[3]=""
951 #sstring[4]=""
952
953=== modified file 'job-parts/build_deployer_quickcheck.sh'
954--- job-parts/build_deployer_quickcheck.sh 2015-04-13 18:55:03 +0000
955+++ job-parts/build_deployer_quickcheck.sh 2015-05-17 14:36:39 +0000
956@@ -13,6 +13,11 @@
957 f_juju_get_pkg_info juju-pkg-info.txt
958 f_deployer_quickcheck
959
960+# Float and announce guis
961+export FLOATERS="juju-gui/0 openstack-dashboard/0 ubuntu/0"
962+f_floaters
963+f_announce_gui_floats
964+
965 # Confirm deployment
966 f_line "Confirm deployment"
967 juju_ok="$(${OSCI_ROOT}/job-parts/juju_deploy_ok.sh || true)"
968
969=== added file 'job-parts/build_git_deploy_test.sh'
970--- job-parts/build_git_deploy_test.sh 1970-01-01 00:00:00 +0000
971+++ job-parts/build_git_deploy_test.sh 2015-05-17 14:36:39 +0000
972@@ -0,0 +1,76 @@
973+#!/bin/bash -e
974+# OpenStack Test Deployment
975+test="deploy"
976+
977+# Source the common functions
978+. ${OSCI_ROOT}/job-parts/osci_job_common.sh
979+
980+#f_fresh_clean_start
981+# NOTE: workspace not cleaned at this step, as the jenkins job may be copying
982+# artifacts to the workspace from another job (such as uploading a custom bundle).
983+# Workspace should have been cleaned as step 0 in the jenkins job.
984+f_refreshtools_jujuclean
985+f_env_no_pass
986+f_touch_try
987+
988+# Handle merge-proposal trigger and substitute the proposed branch in the bundle file
989+#f_openstack_mergeprop_bundle_handler
990+
991+# Handle custom deployer bundle file if present
992+f_openstack_custom_bundle_handler
993+
994+# Go!
995+f_line "Deploy OpenStack"
996+f_juju_get_pkg_info juju-pkg-info.txt
997+f_openstack_deploy
998+
999+# Float and announce guis
1000+f_floaters
1001+f_announce_gui_floats
1002+
1003+# Confirm deployment, configure it, run tempest smoke
1004+f_line "Confirm deployment"
1005+juju_ok="$(${OSCI_ROOT}/job-parts/juju_deploy_ok.sh || true)"
1006+echo $juju_ok
1007+f_juju_status_health_check "-post-deploy"
1008+
1009+if [[ "$juju_ok" == *DEPLOYED:* ]]; then
1010+ echo " . OpenStack juju deployment succeeded."
1011+ touch $WORKSPACE/fyi-${test:0:4}.deploy.ok
1012+
1013+ f_line "Validate CLI auth and basic functionality"
1014+ f_openstack_cli_basic_check
1015+
1016+ f_line "Misc post-deploy configs and checks"
1017+ f_openstack_tempstack_config
1018+
1019+ f_line "Configure via o-c-t script"
1020+ f_openstack_configure
1021+
1022+ f_line "Create heat stack from git templates repo"
1023+ f_openstack_heat_stack_create
1024+
1025+ f_line "Install tempest requirements"
1026+ f_openstack_tempest_deps
1027+
1028+ f_juju_stat "-pre-tempest"
1029+
1030+ f_line "Run tempest smoke tests"
1031+ f_openstack_run_tempest_smoke
1032+
1033+ f_line "Pull tempest summary"
1034+ f_openstack_tempest_summarize
1035+else
1036+ echo " ! Juju deployment failed."
1037+ echo " ! Skipping tempest."
1038+ touch $WORKSPACE/fyi.tempest.skipped
1039+ touch $WORKSPACE/fyi.deploy.failed
1040+fi
1041+
1042+f_collect_juju_logs
1043+
1044+f_line "End of deployment test"
1045+f_set_build_descr
1046+#f_post_mp_comment
1047+f_nice_finish
1048+f_openstack_check_fail
1049
1050=== modified file 'job-parts/osci_job_common.sh'
1051--- job-parts/osci_job_common.sh 2015-05-05 13:32:30 +0000
1052+++ job-parts/osci_job_common.sh 2015-05-17 14:36:39 +0000
1053@@ -231,10 +231,10 @@
1054 function f_virtualenv() {
1055 # Make the virtualenv target, if it exists, and wrapped in proxy
1056 # environment variables, if they exist.
1057- f_proxy_if_proxy
1058+ f_proxy_if_proxy
1059 cd $CO_DIR
1060 make virtualenv || true
1061- f_proxy_unset
1062+ f_proxy_unset
1063 }
1064
1065
1066@@ -319,8 +319,11 @@
1067 function f_proxy_if_proxy() {
1068 # Set http proxy if already set for amulet
1069 if [[ -n "$AMULET_HTTP_PROXY" ]]; then
1070+ export NO_PROXY=$OSCI_NO_PROXY
1071 export HTTP_PROXY=$AMULET_HTTP_PROXY
1072 export HTTPS_PROXY=$(echo $AMULET_HTTP_PROXY | sed 's/http/https/g')
1073+ export http_proxy=$HTTP_PROXY
1074+ export https_proxy=$HTTPS_PROXY
1075 echo " + Enabling HTTP(S) proxies."
1076 env | grep PROXY
1077 fi
1078@@ -329,8 +332,10 @@
1079
1080 function f_proxy_unset() {
1081 echo " - Unsetting HTTP(S) proxies if set."
1082+ unset NO_PROXY
1083 unset HTTP_PROXY
1084 unset HTTPS_PROXY
1085+ unset no_proxy
1086 unset http_proxy
1087 unset https_proxy
1088 }
1089
1090=== modified file 'job-parts/osci_openstack_common.sh'
1091--- job-parts/osci_openstack_common.sh 2015-04-13 18:48:12 +0000
1092+++ job-parts/osci_openstack_common.sh 2015-05-17 14:36:39 +0000
1093@@ -74,6 +74,7 @@
1094 function f_openstack_set_network_env_vars() {
1095 # Set o-c-t configure script overrides for neutron ports
1096 dpkg-query --show ipcalc || sudo apt-get install ipcalc
1097+ export NAME_SERVER="grep nameserver /etc/resolv.conf | head -n 1 | awk '{ print $2 }' | xargs"
1098 export NET_ID="$(grep network ~/.juju/environments.yaml | head -n 1 | awk '{ print $2 }')"
1099 export CIDR_EXT=$(juju ssh 0 "sudo ip route show dev eth0" | grep '/' | awk '{ print $1 }')
1100 export GATEWAY=$(juju ssh 0 "sudo ip route show 0.0.0.0/0 dev eth0" | grep default | awk '{ print $3 }')
1101@@ -285,3 +286,49 @@
1102 2>&1 | tee $WORKSPACE/deployer.$BUILD_NUMBER
1103 sleep 30
1104 }
1105+
1106+
1107+function f_get_floating_ip() {
1108+# Return the first available floating IP. Assumes at least 1 exists.
1109+ nova floating-ip-list | grep '\- ' | awk '{ print $2 }' | head -n 1
1110+}
1111+
1112+
1113+function f_floaters() {
1114+# Assign floating IP addresses to units listed in the FLOATERS
1115+# environment variable. Non-fatal if units do not exist.
1116+# Also non-fatal if association fails.
1117+ [[ -z "$FLOATERS" ]] && export FLOATERS="juju-gui/0 openstack-dashboard/0"
1118+ f_novarc_undercloud
1119+ jstat_all=$(mktemp)
1120+ jstat=$(mktemp)
1121+ juju stat --format=yaml > $jstat_all
1122+
1123+ for unit in $FLOATERS; do
1124+ if [[ -z "$(grep $unit $jstat_all)" ]]; then
1125+ echo " ! Unit not found to float: ${unit}"
1126+ else
1127+ juju stat $unit --format=yaml > $jstat
1128+ iid=$(grep instance-id $jstat | awk '{ print $2 }')
1129+ fip=$(f_get_floating_ip)
1130+ ip_f=$(f_get_floating_ip)
1131+ echo " + Associating floating IP ${fip} to instance ${iid} for unit ${unit}."
1132+ nova floating-ip-associate $iid $fip || true
1133+ fi
1134+ done
1135+ rm -fv $jstat_all
1136+ rm -fv $jstat
1137+}
1138+
1139+
1140+function f_announce_gui_floats() {
1141+# Display juju gui and openstack dashboard URLs if they exist.
1142+# Also announce ubuntu/0 floating IP for debug purposes, if exists.
1143+ f_line "GUI info, if available"
1144+ jgui_fip=$(juju stat juju-gui/0 | grep public-address | cut -f 2 -d ":" | xargs || true)
1145+ dash_fip=$(juju stat openstack-dashboard/0 | grep public-address | cut -f 2 -d ":" | xargs || true)
1146+ ubnt_fip=$(juju stat ubuntu/0 | grep public-address | cut -f 2 -d ":" | xargs || true)
1147+ [[ -n "$jgui_fip" ]] && echo "Juju GUI URL: https://${jgui_fip}" || true
1148+ [[ -n "$dash_fip" ]] && echo "OpenStack Dashboard URL: http://${dash_fip}/horizon" || true
1149+ [[ -n "$ubnt_fip" ]] && echo "Ubuntu Floating IP: ${ubnt_fip}" || true
1150+}

Subscribers

People subscribed via source and target branches