Merge lp:~milo/linaro-ci-dashboard/android-build-config into lp:linaro-ci-dashboard

[Milo Casagrande]

Here there is preliminary support for android build of type "android".
We had to refactor a little bit the code, in particular:
- Added a new parameter to the schedule_build method in the Loop class, in order to be able to pass parameters to Jenkins. This was needed since using the same config.xml file taken from the build at android-build.linaro.org, we were not able to trigger a run.
 - Added a specialized AndroidLoopBuildView, in order to correctly pass the defined parameters via the overridden schedule_build method. This was necessary since that method is called inside the LoopBuildView class, in loop_build_view, and it considers the object passed only as Loop, not as a "specialized" one, and the method called was then the one inside Loop, not the specialized one.
 - Slightly modfied the method to create the job xml inside JenkinsServer. With android build we have right now 3 different templates for the jobs, we cannot rely solely on the class name to identify them. At the moment we added only one template.

There are also some PEP8 fixes.

[lp:~milo/linaro-ci-dashboard/android-build-config]

30. By Milo Casagrande on 2012-08-23

Use only one android loop template.

[Milo Casagrande (milo)]

I updated the branch, after a better look at the XML files, they differ only in a small part.
We are now using the same approach of using the class name for the template file, modifying only one parameter in case the build is 'restricted'.

[Paul Sokolovsky (pfalcon)]

> - Slightly modfied the method to create the job xml inside JenkinsServer. With android build we have right now 3 different templates for the jobs, we cannot rely solely on the class name to identify them. At the moment we added only one template.

Well, that kinda hints that these should be 3 different model classes ;-I. (Unless there's general and universal approach how to deal with such cases for future, but having separate models is KISS, at least on model side (vs handling them)).

664 + if template_name == 'AndroidLoop':
665 + template_name = loop.build_type
666 + loop_params['base64_config'] = loop.base64_config()

In the outlook I was having when introduced templating, this would be dealt with differently: AndroidLoop.json() would be overriden to add "base64_config" with needed value, then JenkinsServer wouldn't need to know about AndroidLoop existence and its peculiarities.

Re: other changes - it's a bit hard to review them, because it seems that diff is being made against older version of trunk, while tip of it already contains templating code, etc. Can you merge trunk into this branch and re-push it to get better diff?

[Paul Sokolovsky (pfalcon)]

Well, imho "if template_name == 'AndroidLoop':" really Needs Fixing.

review: Needs Fixing

[Milo Casagrande (milo)]

>
> Re: other changes - it's a bit hard to review them, because it seems that diff
> is being made against older version of trunk, while tip of it already contains
> templating code, etc. Can you merge trunk into this branch and re-push it to
> get better diff?

It is actually based on trunk, the problem was that we were already working on the template part, adding the directories as needed, but conflicts raised when merging trunk (conflicts on directory, with ".moved" attached to it). I thought that using "bzr resolve" would have clean it out, but that was not the case. It marked as removed and then added back the files.

[Stevan Radaković (stevanr)]

> > - Slightly modfied the method to create the job xml inside JenkinsServer.
> With android build we have right now 3 different templates for the jobs, we
> cannot rely solely on the class name to identify them. At the moment we added
> only one template.
>
> Well, that kinda hints that these should be 3 different model classes ;-I.
> (Unless there's general and universal approach how to deal with such cases for
> future, but having separate models is KISS, at least on model side (vs
> handling them)).
>
> 664 + if template_name == 'AndroidLoop':
> 665 + template_name = loop.build_type
> 666 + loop_params['base64_config'] = loop.base64_config()
>
> In the outlook I was having when introduced templating, this would be dealt
> with differently: AndroidLoop.json() would be overriden to add "base64_config"
> with needed value, then JenkinsServer wouldn't need to know about AndroidLoop
> existence and its peculiarities.

I can't agree with this. Moving template logic to the loop is not viable, as we discussed over and over again.
JenkinsServer need to know about the loops, since it can't be the other way around. It's not the Jenkins app that will be resusable by other applications in the future, but the frontend one.

>
> Re: other changes - it's a bit hard to review them, because it seems that diff
> is being made against older version of trunk, while tip of it already contains
> templating code, etc. Can you merge trunk into this branch and re-push it to
> get better diff?

[Milo Casagrande (milo)]

I took a look and tried to use the AndroidLoop.json() approach, but I agree with Stevan, and that was our initial intention when we added the "if-clause" in JenkinsServer: storing nothing in the loop WRT the server.

Also, using the json() approach, I will really bond Jenkins specific values (like the name of the node, plus the possible base64 one) into the loop.

For a more general approach, I would also move the base64 calculation into JenkinsServer, and dealing with it only for the android loop (at the moment, since other jobs may use it).

[Paul Sokolovsky (pfalcon)]

> JenkinsServer need to know about the loops, since it can't be the other way around.

My approach allows to decouple them even further and to follow data-driven approach: so neither JenkinsServer needs to know about adhoc peculiarities, nor Loops need to be tied to particular build system.

So, it all reduces to the question of where you draw the line regarding what is "including build system specific data into Loop". Let's start with saying that the fact that Jenkins uses XML for job config, and particular layout of XML is Jenkins-specific thing, and we can't include direct Jenkins job config generation as method of Loop.

Now let's think about culprits:

"like the name of the node" - well, that value is not really *name* of *specific Jenkins node*. It's a *tag* of node *type*. So, there's an abstract node, and it may have tags, and job (aka loop), may also have tags, and if tagsets of a node and job are compatible, the job can build on such node. That's fairly generic concept, not really tied to Jenkins, any sufficiently advanced build system would have similar concept. I don't see probs with that being a property of a loop.

base64-encoded entire job config - well, that's more peculiar, but looking "from the top", it's just that, implementation of following requirement: 1) being able to pass entire loop config to the build system; 2) that entire config being serialized in well-known format. So, those requirements and feature is not really Jenkins-specific, it fairly generic feature, which again can be reasonable assumed to be in need, and supported/parsable by any build system.

So, again it all depends on where you draw the line. I draw the line at the place which allows to use data-driven approach, to avoid patching code for each and every discovered peculiarities (with my outlook, it'll better to have {% if %}'s in templates, then in Jenkins server.

I don't say I'm right, just wanted to make sure that perspective is well understood. The strongest counter-argument I may imagine is you saying that all my approach is based on the fact that a job in build system can be created from a text config file which we prepare at once and submit. I would say that it covers our usecase so far (implemented in well-maintainable, declarative way) ;-). And would continue that if you want to make it fully generic (on code) and maintainable, then patching single method with more and more if's as we go won't scale. Then you'd need to add another layer (i.e.) class which algorithmically encodes process of creating a build from (particular type of) Loop, then have a registry (i.e. factory) which would allow to apply it to any type of Loop. Then would as beautiful as the solution I propose, though not declarative and data-driven.

Anyway, I change my vote to "Abstain" in this regard, and the rest looks good as far as I can tell.

review: Abstain

[Paul Sokolovsky (pfalcon)]

Whoa, that was long, sorry ;-)

[Stevan Radaković (stevanr)]

Great work Milo.

354 + parameters = {'parameter': [{'delay': '0'}]}
355 self.server.create_or_update_integration_loop(self)
356 - super(AndroidLoop, self).schedule_build()
357 + return super(self.__class__, self).schedule_build(parameters)

'create_or_update_integration_loop' ? Think we need some refactoring here (jenkinsserver side as well probably)

535 - def schedule_build(self):
536 - # Every time before the build is scheduled, update the
537 - # loop config on the remote server.
538 - self.server.create_or_update_integration_loop(self)
539 - super(IntegrationLoop, self).schedule_build()
540 -

Hm, why was this removed?

Regarding concerns Paul raised, we are going to discuss this on the meeting...

review: Needs Fixing (code)

[Milo Casagrande (milo)]

On Fri, Aug 24, 2012 at 11:47 AM, Stevan Radaković
<email address hidden> wrote:
>
> 354 + parameters = {'parameter': [{'delay': '0'}]}
> 355 self.server.create_or_update_integration_loop(self)
> 356 - super(AndroidLoop, self).schedule_build()
> 357 + return super(self.__class__, self).schedule_build(parameters)
>
> 'create_or_update_integration_loop' ? Think we need some refactoring here (jenkinsserver side as well probably)

Will refactor that into a "create_or_update_loop".

> 535 - def schedule_build(self):
> 536 - # Every time before the build is scheduled, update the
> 537 - # loop config on the remote server.
> 538 - self.server.create_or_update_integration_loop(self)
> 539 - super(IntegrationLoop, self).schedule_build()
> 540 -
>
> Hm, why was this removed?

This is actually not called, as long as you do not create your own
"build_view". We discovered that while trying to pass the "params"
dictionary to the jenkins server: it was always "None", the default
value defined. We had to temporary add logger calls everywhere to sort
it out.

When you click on the "schedule" button, what it calls is what is
found in the "loop/build/" URL, that matches to the "LoopBuildView"
view. This one, in turn, calls "self.object.schedule_build()", but
"self.object" in there is always of type Loop since the class is
defined against that model, and not an instance of the specific Loop.

If you want that method to be called, you need to define your own
"$LOOP_build_view", inherit from LoopBuildView, and in there just
define "model = $MODEL_CLASS" (plus add your "build" URL). In this way
that method is called, otherwise it can be safely removed since it
will never be called.

--
Milo Casagrande
Infrastructure Engineer
Linaro.org <www.linaro.org> │ Open source software for ARM SoCs

[lp:~milo/linaro-ci-dashboard/android-build-config]

31. By Milo Casagrande on 2012-08-23

Merged from trunk.

32. By Milo Casagrande on 2012-08-24

Added new fields, updated migration.

[Stevan Radaković (stevanr)]

> On Fri, Aug 24, 2012 at 11:47 AM, Stevan Radaković
> <email address hidden> wrote:
> >
> > 354 + parameters = {'parameter': [{'delay': '0'}]}
> > 355 self.server.create_or_update_integration_loop(self)
> > 356 - super(AndroidLoop, self).schedule_build()
> > 357 + return super(self.__class__, self).schedule_build(parameters)
> >
> > 'create_or_update_integration_loop' ? Think we need some refactoring here
> (jenkinsserver side as well probably)
>
> Will refactor that into a "create_or_update_loop".
>
> > 535 - def schedule_build(self):
> > 536 - # Every time before the build is scheduled, update the
> > 537 - # loop config on the remote server.
> > 538 - self.server.create_or_update_integration_loop(self)
> > 539 - super(IntegrationLoop, self).schedule_build()
> > 540 -
> >
> > Hm, why was this removed?
>
> This is actually not called, as long as you do not create your own
> "build_view". We discovered that while trying to pass the "params"
> dictionary to the jenkins server: it was always "None", the default
> value defined. We had to temporary add logger calls everywhere to sort
> it out.
>
> When you click on the "schedule" button, what it calls is what is
> found in the "loop/build/" URL, that matches to the "LoopBuildView"
> view. This one, in turn, calls "self.object.schedule_build()", but
> "self.object" in there is always of type Loop since the class is
> defined against that model, and not an instance of the specific Loop.
>
> If you want that method to be called, you need to define your own
> "$LOOP_build_view", inherit from LoopBuildView, and in there just
> define "model = $MODEL_CLASS" (plus add your "build" URL). In this way
> that method is called, otherwise it can be safely removed since it
> will never be called.
>

Ok this is a nice catch, but it was hardly the way to resolve the problem you noticed, since we need this create_or_update called.
I'll add this to my action list...

[Milo Casagrande (milo)]

On Fri, Aug 24, 2012 at 1:16 PM, Stevan Radaković
<email address hidden> wrote:
>
> Ok this is a nice catch, but it was hardly the way to resolve the problem you noticed, since we need this create_or_update called.
> I'll add this to my action list...

You are right, my fault. I actually had to add it into the Loop class,
so that we do not need to call it in each derived class.

--
Milo Casagrande
Infrastructure Engineer
Linaro.org <www.linaro.org> │ Open source software for ARM SoCs

[lp:~milo/linaro-ci-dashboard/android-build-config]

33. By Milo Casagrande on 2012-08-24

Moved call to updated config into Loop, refactored.

34. By Milo Casagrande on 2012-08-24

Reverted commit.

[Milo Casagrande (milo)]

On Fri, Aug 24, 2012 at 1:45 PM, Milo Casagrande
<email address hidden> wrote:
>
> You are right, my fault. I actually had to add it into the Loop class,
> so that we do not need to call it in each derived class.

I just tried, but I reverted back. It is not only a matter of moving
the call, we need to define the specialized "build_view" also for the
other loops, otherwise it will not work, since what will be passed
will be the "Loop" object and not the actual derived one (like
KernelLoop or IntegrationLoop).

WRT IntegrationLoop, even removing it, but not adding the
"update_or_create" call into Loop, it can schedule a new build, but it
will never update the config. Same thing happens if we leave it there:
it is never called. If we add the call to "update_or_create" inside
Loop, it will fail with error 500 since we are not defining the
specialized "build_view".

I can take a look at it, it is not a problem, but in a separate
branch, so we have a clean diff of what is going on.

--
Milo Casagrande
Infrastructure Engineer
Linaro.org <www.linaro.org> │ Open source software for ARM SoCs

[Stevan Radaković (stevanr)]

Ok thanks for looking into it. Let's just rename the method to create_or_update_loop and get this landed.
Approve +1

review: Approve (code)

[lp:~milo/linaro-ci-dashboard/android-build-config]

35. By Milo Casagrande on 2012-08-24

Fixed problem with android detail view.

36. By Milo Casagrande on 2012-08-24

Fixed JenkinsServer to use new parameters.

37. By Milo Casagrande on 2012-08-24

Refactored method name.

=== added file 'config_template/build_scripts/AndroidLoop.sh'
--- config_template/build_scripts/AndroidLoop.sh	1970-01-01 00:00:00 +0000
+++ config_template/build_scripts/AndroidLoop.sh	2012-08-24 13:08:33 +0000
@@ -0,0 +1,4 @@
+rm -rf build-tools
+bzr get lp:linaro-android-build-tools build-tools
+build-tools/node/build us-east-1.ec2-git-mirror.linaro.org "$CONFIG"
+#build-tools/node/build "$HUDSON_URL" "$CONFIG"

=== added file 'config_template/build_scripts/IntegrationLoop.sh'
--- config_template/build_scripts/IntegrationLoop.sh	1970-01-01 00:00:00 +0000
+++ config_template/build_scripts/IntegrationLoop.sh	2012-08-24 13:08:33 +0000
@@ -0,0 +1,8 @@
+rm -rf dest_dir
+export USER=`whoami`;
+export HOME=/home/$USER
+bzr branch {branch} dest_dir
+cur_dir=$WORKSPACE; cd ./dest_dir
+{precommand}
+{command}
+cd "$cur_dir"

=== removed file 'config_template/build_scripts/IntegrationLoop.sh'
--- config_template/build_scripts/IntegrationLoop.sh	2012-08-21 10:17:49 +0000
+++ config_template/build_scripts/IntegrationLoop.sh	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-rm -rf dest_dir
-export USER=`whoami`;
-export HOME=/home/$USER
-bzr branch {branch} dest_dir
-cur_dir=$WORKSPACE; cd ./dest_dir
-{precommand}
-{command}
-cd "$cur_dir"

=== added file 'config_template/jenkins-jobs/AndroidLoop.xml'
--- config_template/jenkins-jobs/AndroidLoop.xml	1970-01-01 00:00:00 +0000
+++ config_template/jenkins-jobs/AndroidLoop.xml	2012-08-24 13:08:33 +0000
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <actions/>
+  <description>&lt;!-- Automatically managed header - do not change, do not add anything before this! --&gt;
+&lt;table width="65%" align="center"&gt;
+&lt;tr&gt;&lt;td&gt;
+&lt;p style="background: #FFCCFF; padding: 15px"&gt;
+&lt;span style="color: gray"&gt;New!&lt;/span&gt;&lt;br /&gt;
+We now provide &lt;tt&gt;linaro_android_build_cmds.sh&lt;/tt&gt; script (see downloads)
+with exact commands to reproduce this build. Use it as a reference of
+commands you need to execute, or just run to perform a build automatically.
+There is also &lt;tt&gt;linaro_kernel_build_cmds.sh&lt;/tt&gt; to rebuild just a kernel.
+Alternatively, you can try instructions below.
+&lt;/td&gt;&lt;/tr&gt;
+&lt;/p&gt;
+&lt;/table&gt;
+
+&lt;!-- End of automatically managed header --&gt;
+
+</description>
+  <logRotator>
+    <daysToKeep>30</daysToKeep>
+    <numToKeep>10</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
+  <keepDependencies>true</keepDependencies>
+  <properties>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>CONFIG</name>
+          <description/>
+          <defaultValue>{base64_config}</defaultValue>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <assignedNode>{assigned_node}</assignedNode>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector"/>
+  <concurrentBuild>true</concurrentBuild>
+  <builders>
+    <hudson.plugins.shell.ShellWithStatus>
+      <command>{build_script}</command>
+    </hudson.plugins.shell.ShellWithStatus>
+    <jenkins.plugins.publish__over__ssh.BapSshBuilderPlugin>
+      <delegate>
+        <consolePrefix>SSH: </consolePrefix>
+        <delegate>
+          <publishers>
+            <jenkins.plugins.publish__over__ssh.BapSshPublisher>
+              <configName>snapshots.linaro.org new</configName>
+              <verbose>false</verbose>
+              <transfers>
+                <jenkins.plugins.publish__over__ssh.BapSshTransfer>
+                  <remoteDirectory>android/${{JOB_NAME}}/${{BUILD_NUMBER}}</remoteDirectory>
+                  <sourceFiles>build/out/target/*/*/*.img.bz2,build/out/target/*/*/*.tar.bz2,build/out/target/*/*/MD5SUMS,build/out/*.tar.bz2,build/out/*.xml,build/out/*_config,build/out/lava-job-info,build/out/linaro_kernel_build_cmds.sh,build/out/linaro_android_build_cmds.sh,build/out/**/*EULA*</sourceFiles>
+                  <excludes/>
+                  <removePrefix>build/out</removePrefix>
+                  <remoteDirectorySDF>false</remoteDirectorySDF>
+                  <flatten>false</flatten>
+                  <cleanRemote>false</cleanRemote>
+                  <execCommand/>
+                  <execTimeout>120000</execTimeout>
+                  <usePty>false</usePty>
+                </jenkins.plugins.publish__over__ssh.BapSshTransfer>
+              </transfers>
+              <useWorkspaceInPromotion>false</useWorkspaceInPromotion>
+              <usePromotionTimestamp>false</usePromotionTimestamp>
+            </jenkins.plugins.publish__over__ssh.BapSshPublisher>
+            <jenkins.plugins.publish__over__ssh.BapSshPublisher>
+              <configName>snapshots.linaro.org file-move new</configName>
+              <verbose>false</verbose>
+              <transfers>
+                <jenkins.plugins.publish__over__ssh.BapSshTransfer>
+                  <remoteDirectory/>
+                  <sourceFiles/>
+                  <excludes/>
+                  <removePrefix/>
+                  <remoteDirectorySDF>false</remoteDirectorySDF>
+                  <flatten>false</flatten>
+                  <cleanRemote>false</cleanRemote>
+                  <execCommand>reshuffle-files -t android -j ${{JOB_NAME}} -n ${{BUILD_NUMBER}} -m</execCommand>
+                  <execTimeout>120000</execTimeout>
+                  <usePty>false</usePty>
+                </jenkins.plugins.publish__over__ssh.BapSshTransfer>
+              </transfers>
+              <useWorkspaceInPromotion>false</useWorkspaceInPromotion>
+              <usePromotionTimestamp>false</usePromotionTimestamp>
+            </jenkins.plugins.publish__over__ssh.BapSshPublisher>
+          </publishers>
+          <continueOnError>false</continueOnError>
+          <failOnError>false</failOnError>
+          <alwaysPublishFromMaster>true</alwaysPublishFromMaster>
+          <hostConfigurationAccess class="jenkins.plugins.publish_over_ssh.BapSshPublisherPlugin" reference="../.."/>
+        </delegate>
+      </delegate>
+    </jenkins.plugins.publish__over__ssh.BapSshBuilderPlugin>
+    <hudson.tasks.Shell>
+      <command>build-tools/node/lava-submit "$CONFIG"
+</command>
+    </hudson.tasks.Shell>
+    <jenkins.plugins.publish__over__ssh.BapSshBuilderPlugin>
+      <delegate>
+        <consolePrefix>SSH: </consolePrefix>
+        <delegate>
+          <publishers>
+            <jenkins.plugins.publish__over__ssh.BapSshPublisher>
+              <configName>snapshots.linaro.org new</configName>
+              <verbose>false</verbose>
+              <transfers>
+                <jenkins.plugins.publish__over__ssh.BapSshTransfer>
+                  <remoteDirectory>android/${{JOB_NAME}}/${{BUILD_NUMBER}}</remoteDirectory>
+                  <sourceFiles>build/out/lava-job-info</sourceFiles>
+                  <excludes/>
+                  <removePrefix>build/out</removePrefix>
+                  <remoteDirectorySDF>false</remoteDirectorySDF>
+                  <flatten>false</flatten>
+                  <cleanRemote>false</cleanRemote>
+                  <execCommand/>
+                  <execTimeout>120000</execTimeout>
+                  <usePty>false</usePty>
+                </jenkins.plugins.publish__over__ssh.BapSshTransfer>
+              </transfers>
+              <useWorkspaceInPromotion>false</useWorkspaceInPromotion>
+              <usePromotionTimestamp>false</usePromotionTimestamp>
+            </jenkins.plugins.publish__over__ssh.BapSshPublisher>
+          </publishers>
+          <continueOnError>false</continueOnError>
+          <failOnError>false</failOnError>
+          <alwaysPublishFromMaster>true</alwaysPublishFromMaster>
+          <hostConfigurationAccess class="jenkins.plugins.publish_over_ssh.BapSshPublisherPlugin" reference="../.."/>
+        </delegate>
+      </delegate>
+    </jenkins.plugins.publish__over__ssh.BapSshBuilderPlugin>
+    <jenkins.plugins.publish__over__ssh.BapSshBuilderPlugin>
+      <delegate>
+        <consolePrefix>SSH: </consolePrefix>
+        <delegate>
+          <publishers>
+            <jenkins.plugins.publish__over__ssh.BapSshPublisher>
+              <configName>snapshots.linaro.org file-move new</configName>
+              <verbose>false</verbose>
+              <transfers>
+                <jenkins.plugins.publish__over__ssh.BapSshTransfer>
+                  <remoteDirectory/>
+                  <sourceFiles/>
+                  <excludes/>
+                  <removePrefix/>
+                  <remoteDirectorySDF>false</remoteDirectorySDF>
+                  <flatten>false</flatten>
+                  <cleanRemote>false</cleanRemote>
+                  <execCommand>reshuffle-files -t android -j ${{JOB_NAME}} -n ${{BUILD_NUMBER}} -m</execCommand>
+                  <execTimeout>120000</execTimeout>
+                  <usePty>false</usePty>
+                </jenkins.plugins.publish__over__ssh.BapSshTransfer>
+              </transfers>
+              <useWorkspaceInPromotion>false</useWorkspaceInPromotion>
+              <usePromotionTimestamp>false</usePromotionTimestamp>
+            </jenkins.plugins.publish__over__ssh.BapSshPublisher>
+          </publishers>
+          <continueOnError>false</continueOnError>
+          <failOnError>false</failOnError>
+          <alwaysPublishFromMaster>true</alwaysPublishFromMaster>
+          <hostConfigurationAccess class="jenkins.plugins.publish_over_ssh.BapSshPublisherPlugin" reference="../.."/>
+        </delegate>
+      </delegate>
+    </jenkins.plugins.publish__over__ssh.BapSshBuilderPlugin>
+    <hudson.tasks.Shell>
+      <command>echo "Build finished"
+</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <hudson.tasks.ArtifactArchiver>
+      <artifacts>build/out/*.xml</artifacts>
+      <latestOnly>false</latestOnly>
+    </hudson.tasks.ArtifactArchiver>
+    <hudson.plugins.logparser.LogParserPublisher>
+      <unstableOnWarning>false</unstableOnWarning>
+      <failBuildOnError>false</failBuildOnError>
+      <parsingRulesPath>/var/lib/jenkins/userContent/android.parse</parsingRulesPath>
+    </hudson.plugins.logparser.LogParserPublisher>
+    <hudson.tasks.Fingerprinter>
+      <targets>build/fingerprints/*</targets>
+      <recordBuildArtifacts>false</recordBuildArtifacts>
+    </hudson.tasks.Fingerprinter>
+  </publishers>
+  <buildWrappers>
+    <hudson.plugins.build__timeout.BuildTimeoutWrapper>
+      <timeoutMinutes>180</timeoutMinutes>
+      <failBuild>false</failBuild>
+    </hudson.plugins.build__timeout.BuildTimeoutWrapper>
+    <com.michelin.cio.hudson.plugins.copytoslave.CopyToSlaveBuildWrapper>
+      <includes>**/*</includes>
+      <excludes/>
+      <flatten>false</flatten>
+      <includeAntExcludes>false</includeAntExcludes>
+      <hudsonHomeRelative>false</hudsonHomeRelative>
+      <relativeTo>copyToSlave</relativeTo>
+    </com.michelin.cio.hudson.plugins.copytoslave.CopyToSlaveBuildWrapper>
+  </buildWrappers>
+</project>
\ No newline at end of file

=== added file 'config_template/jenkins-jobs/IntegrationLoop.xml'
--- config_template/jenkins-jobs/IntegrationLoop.xml	1970-01-01 00:00:00 +0000
+++ config_template/jenkins-jobs/IntegrationLoop.xml	2012-08-24 13:08:33 +0000
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties/>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector"/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>{build_script}</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers/>
+  <buildWrappers/>
+</project>

=== removed file 'config_template/jenkins-jobs/IntegrationLoop.xml'
--- config_template/jenkins-jobs/IntegrationLoop.xml	2012-08-21 10:17:49 +0000
+++ config_template/jenkins-jobs/IntegrationLoop.xml	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
-  <actions/>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties/>
-  <scm class="hudson.scm.NullSCM"/>
-  <canRoam>true</canRoam>
-  <disabled>false</disabled>
-  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
-  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
-  <triggers class="vector"/>
-  <concurrentBuild>false</concurrentBuild>
-  <builders>
-    <hudson.tasks.Shell>
-      <command>{build_script}</command>
-    </hudson.tasks.Shell>
-  </builders>
-  <publishers/>
-  <buildWrappers/>
-</project>

=== modified file 'dashboard/frontend/android_build/forms/android_loop_form.py'
--- dashboard/frontend/android_build/forms/android_loop_form.py	2012-08-17 12:05:12 +0000
+++ dashboard/frontend/android_build/forms/android_loop_form.py	2012-08-24 13:08:33 +0000
@@ -26,7 +26,7 @@
 class AndroidLoopForm(ModelForm):
     class Meta:
         model = AndroidLoop
-        exclude = ('server', 'config')
+        exclude = ('server')
 
     def clean(self):
         cleaned_data = super(AndroidLoopForm, self).clean()

=== modified file 'dashboard/frontend/android_build/models/android_loop.py'
--- dashboard/frontend/android_build/models/android_loop.py	2012-08-22 12:19:55 +0000
+++ dashboard/frontend/android_build/models/android_loop.py	2012-08-24 13:08:33 +0000
@@ -55,10 +55,16 @@
     DEFAULT_GCC = '4.4.0'
     DEFAULT_IMAGE_SIZE = '2G'
 
+    EXCLUDE_LIST = ['id', 'name', 'server', 'loop_ptr']
+
     # BUILD_TYPE
-    build_type = models.CharField(max_length=100, choices=ANDROID_BUILD_TYPES, verbose_name='Build type')
+    build_type = models.CharField(max_length=100,
+                                  choices=ANDROID_BUILD_TYPES,
+                                  verbose_name='Build type')
     # MANIFEST_REPO
-    manifest_repo = models.CharField(max_length=255, default=DEFAULT_REPO, verbose_name='Manifest repo')
+    manifest_repo = models.CharField(max_length=255,
+                                     default=DEFAULT_REPO,
+                                     verbose_name='Manifest repo')
     # MANIFEST_BRANCH
     manifest_branch = models.CharField(max_length=50, default=DEFAULT_BRANCH)
     # REPO_QUIET
@@ -111,11 +117,11 @@
 
     def save(self, *args, **kwargs):
         self.server = JenkinsServer.objects.get(id=1)
-        super(AndroidLoop, self).save(*args, **kwargs)
+        super(self.__class__, self).save(*args, **kwargs)
         # We do not want a failure in remote server to affect the
         # CI Loop flow.
         try:
-            self.server.create_or_update_integration_loop(self)
+            self.server.create_or_update_loop(self)
         except:
             # TODO: Log error.
             pass
@@ -123,5 +129,6 @@
     def schedule_build(self):
         # Every time before the build is scheduled, update the
         # loop config on the remote server.
-        self.server.create_or_update_integration_loop(self)
-        super(AndroidLoop, self).schedule_build()
+        parameters = {'parameter': [{'delay': '0'}]}
+        self.server.create_or_update_loop(self)
+        return super(self.__class__, self).schedule_build(parameters)

=== modified file 'dashboard/frontend/android_build/templates/android_loop_detail.html'
--- dashboard/frontend/android_build/templates/android_loop_detail.html	2012-08-20 09:10:05 +0000
+++ dashboard/frontend/android_build/templates/android_loop_detail.html	2012-08-24 13:08:33 +0000
@@ -38,7 +38,7 @@
 {% block scripts %}
 <script type="text/javascript">
 $("#schedule_button").click(function() {
-  $.get("{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.get_host }}/loop/build/{{ android_loop_detail.name }}/", function(data) {
+  $.get("{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.get_host }}/android/build/{{ android_loop_detail.name }}/", function(data) {
     data = $.parseJSON(data);
     $("<div/>", {
       "class": "test",

=== modified file 'dashboard/frontend/android_build/tests/test_android_build_clientresponse.py'
--- dashboard/frontend/android_build/tests/test_android_build_clientresponse.py	2012-08-21 06:55:57 +0000
+++ dashboard/frontend/android_build/tests/test_android_build_clientresponse.py	2012-08-24 13:08:33 +0000
@@ -23,15 +23,15 @@
 
     def setUp(self):
         super(AndroidBuildClientResponseTests, self).setUp()
-        self.android_build_data = {"name" : "a-build",
-                                   "build_type" : "build-android",
-                                   "manifest_repo" : "repo",
-                                   "manifest_branch" : "branch",
-                                   "manifest_filename" : "filename",
-                                   "make_jobs" : "2",
-                                   "ramdisk_size" : "2",
-                                   "binutils_version" : "1",
-                                   "gcc_version" : "1"
+        self.android_build_data = {"name": "a-build",
+                                   "build_type": "build-android",
+                                   "manifest_repo": "repo",
+                                   "manifest_branch": "branch",
+                                   "manifest_filename": "filename",
+                                   "make_jobs": "2",
+                                   "ramdisk_size": "2",
+                                   "binutils_version": "1",
+                                   "gcc_version": "1"
                                     }
 
     def test_android_build_create_get(self):
@@ -91,4 +91,3 @@
         self.assertEquals(response.status_code, 200)
         self.assertIn("Details", response.content)
         self.assertIn("Build type", response.content)
-

=== modified file 'dashboard/frontend/android_build/tests/test_android_build_views.py'
--- dashboard/frontend/android_build/tests/test_android_build_views.py	2012-08-21 07:58:37 +0000
+++ dashboard/frontend/android_build/tests/test_android_build_views.py	2012-08-24 13:08:33 +0000
@@ -60,4 +60,4 @@
         context = AndroidLoopUpdateView.get_context_data(
             android_loop_update_view)
         self.assertEqual(context['request'], "some request data")
-        self.assertEqual(context['form_name'], AndroidLoopUpdateView.form_name)
\ No newline at end of file
+        self.assertEqual(context['form_name'], AndroidLoopUpdateView.form_name)

=== modified file 'dashboard/frontend/android_build/urls.py'
--- dashboard/frontend/android_build/urls.py	2012-08-20 09:10:05 +0000
+++ dashboard/frontend/android_build/urls.py	2012-08-24 13:08:33 +0000
@@ -15,13 +15,15 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.conf.urls.defaults import patterns, include, url
-from frontend.android_build.views.android_loop_create_view\
+from django.conf.urls.defaults import patterns, url
+from frontend.android_build.views.android_loop_create_view \
     import AndroidLoopCreateView
-from frontend.android_build.views.android_loop_update_view\
+from frontend.android_build.views.android_loop_update_view \
     import AndroidLoopUpdateView
-from frontend.android_build.views.android_loop_detail_view\
+from frontend.android_build.views.android_loop_detail_view \
     import AndroidLoopDetailView
+from frontend.android_build.views.android_loop_build_view \
+    import AndroidLoopBuildView
 
 
 urlpatterns = patterns('',
@@ -31,4 +33,6 @@
         AndroidLoopDetailView.as_view(), name='AndroidLoopDetail'),
     url(r'^android/update/(?P<slug>[\w|\W]+)/$',
         AndroidLoopUpdateView.as_view(), name='AndroidLoopUpdate'),
+    url(r'^android/build/(?P<slug>[\w|\W]+)/$',
+        AndroidLoopBuildView.as_view(), name='AndroidLoopBuild'),
 )

=== added file 'dashboard/frontend/android_build/views/android_loop_build_view.py'
--- dashboard/frontend/android_build/views/android_loop_build_view.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/android_build/views/android_loop_build_view.py	2012-08-24 13:08:33 +0000
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+# Copyright (C) 2012 Linaro
+#
+# This file is part of linaro-ci-dashboard.
+#
+# linaro-ci-dashboard is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# linaro-ci-dashboard is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+
+from frontend.android_build.models.android_loop import AndroidLoop
+from frontend.views.loop_build_view import LoopBuildView
+
+
+class AndroidLoopBuildView(LoopBuildView):
+
+    model = AndroidLoop

=== modified file 'dashboard/frontend/android_build/views/android_loop_detail_view.py'
--- dashboard/frontend/android_build/views/android_loop_detail_view.py	2012-08-20 16:00:44 +0000
+++ dashboard/frontend/android_build/views/android_loop_detail_view.py	2012-08-24 13:08:33 +0000
@@ -19,9 +19,11 @@
 from django.contrib.auth.decorators import login_required
 from django.views.generic.detail import DetailView
 from django.utils.decorators import method_decorator
-from frontend.android_build.models.android_loop \
-        import AndroidLoop
+from frontend.models.loop import Loop
+from frontend.android_build.models.android_loop import AndroidLoop
 from django.core import serializers
+from itertools import chain
+
 
 class AndroidLoopDetailView(DetailView):
 
@@ -40,6 +42,11 @@
                         self).get_context_data(**kwargs)
         context['request'] = self.request
         context['builds'] = self.object.loop_ptr.loopbuild_set.all()
-        context['data'] = serializers.serialize( "python",
-            AndroidLoop.objects.filter(pk=self.object.loop_ptr.id) )
+
+        # Need to "merge" the two queryset for all the fields to appear
+        querysets = list(chain(AndroidLoop.objects.filter(
+                               pk=self.object.loop_ptr.id),
+                               Loop.objects.filter(pk=self.object.loop_ptr.id)))
+        context['data'] = serializers.serialize("python", querysets)
+
         return context

=== modified file 'dashboard/frontend/integration_loop/forms/integration_loop_form.py'
--- dashboard/frontend/integration_loop/forms/integration_loop_form.py	2012-08-17 11:12:49 +0000
+++ dashboard/frontend/integration_loop/forms/integration_loop_form.py	2012-08-24 13:08:33 +0000
@@ -23,4 +23,4 @@
 class IntegrationLoopForm(ModelForm):
     class Meta:
         model = IntegrationLoop
-        exclude = ('server', 'config')
+        exclude = ('server')

=== modified file 'dashboard/frontend/integration_loop/models/integration_loop.py'
--- dashboard/frontend/integration_loop/models/integration_loop.py	2012-08-17 09:43:07 +0000
+++ dashboard/frontend/integration_loop/models/integration_loop.py	2012-08-24 13:08:33 +0000
@@ -29,22 +29,19 @@
     precommand = models.CharField(max_length=200)
     command = models.CharField(max_length=200)
 
+    EXCLUDE_LIST = ['id', 'name', 'server', 'loop_ptr']
+
     def save(self, *args, **kwargs):
         self.server = JenkinsServer.objects.get(id=1)
-        super(IntegrationLoop, self).save(*args, **kwargs)
+        super(self.__class__, self).save(*args, **kwargs)
         # We do not want a failure in remote server to affect the
         # CI Loop flow.
         try:
-            self.server.create_or_update_integration_loop(self)
+            self.server.create_or_update_loop(self)
         except:
             # TODO: Log error.
             pass
 
-    def schedule_build(self):
-        # Every time before the build is scheduled, update the
-        # loop config on the remote server.
-        self.server.create_or_update_integration_loop(self)
-        super(IntegrationLoop, self).schedule_build()
-
     def __repr__(self):
-        return "IntegrationLoop(id=%d, branch=%s, ...)" % (self.id, self.branch)
+        return "IntegrationLoop(id=%d, branch=%s, ...)" % (self.id,
+                                                           self.branch)

=== modified file 'dashboard/frontend/integration_loop/templates/integration_loop_detail.html'
--- dashboard/frontend/integration_loop/templates/integration_loop_detail.html	2012-08-16 15:12:10 +0000
+++ dashboard/frontend/integration_loop/templates/integration_loop_detail.html	2012-08-24 13:08:33 +0000
@@ -48,7 +48,7 @@
       text: "Build: " + data[0].fields.build_number + " || " +
                         data[0].fields.status + " || " +
                         data[0].fields.duration + " || " +
-                        data[0].fields.remote_number,
+                        data[0].fields.remote_number
     })
     .prependTo($("#builds"));
   });

=== modified file 'dashboard/frontend/kernel_build/models/kernel_loop.py'
--- dashboard/frontend/kernel_build/models/kernel_loop.py	2012-08-23 12:27:08 +0000
+++ dashboard/frontend/kernel_build/models/kernel_loop.py	2012-08-24 13:08:33 +0000
@@ -118,7 +118,7 @@
         # We do not want a failure in remote server to affect the
         # CI Loop flow.
         try:
-            self.server.create_or_update_integration_loop(self)
+            self.server.create_or_update_loop(self)
         except:
             # TODO: Log error.
             pass
@@ -126,5 +126,5 @@
     def schedule_build(self):
         # Every time before the build is scheduled, update the
         # loop config on the remote server.
-        self.server.create_or_update_integration_loop(self)
+        self.server.create_or_update_loop(self)
         super(KernelLoop, self).schedule_build()

=== added file 'dashboard/frontend/migrations/0002_auto__add_field_loop_is_restricted__add_field_loop_is_official.py'
--- dashboard/frontend/migrations/0002_auto__add_field_loop_is_restricted__add_field_loop_is_official.py	1970-01-01 00:00:00 +0000
+++ dashboard/frontend/migrations/0002_auto__add_field_loop_is_restricted__add_field_loop_is_official.py	2012-08-24 13:08:33 +0000
@@ -0,0 +1,54 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        
+        # Adding field 'Loop.is_restricted'
+        db.add_column('frontend_loop', 'is_restricted', self.gf('django.db.models.fields.BooleanField')(default=False), keep_default=False)
+
+        # Adding field 'Loop.is_official'
+        db.add_column('frontend_loop', 'is_official', self.gf('django.db.models.fields.BooleanField')(default=False), keep_default=False)
+
+
+    def backwards(self, orm):
+        
+        # Deleting field 'Loop.is_restricted'
+        db.delete_column('frontend_loop', 'is_restricted')
+
+        # Deleting field 'Loop.is_official'
+        db.delete_column('frontend_loop', 'is_official')
+
+
+    models = {
+        'frontend.loop': {
+            'Meta': {'object_name': 'Loop'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_official': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_restricted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
+            'server': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['jenkinsserver.JenkinsServer']"})
+        },
+        'frontend.loopbuild': {
+            'Meta': {'ordering': "['-id']", 'object_name': 'LoopBuild'},
+            'build_number': ('django.db.models.fields.IntegerField', [], {'default': 'None'}),
+            'duration': ('django.db.models.fields.DecimalField', [], {'max_digits': '8', 'decimal_places': '2'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'loop': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['frontend.Loop']"}),
+            'remote_number': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.CharField', [], {'max_length': '20'})
+        },
+        'jenkinsserver.jenkinsserver': {
+            'Meta': {'object_name': 'JenkinsServer'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'username': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['frontend']

=== modified file 'dashboard/frontend/models/loop.py'
--- dashboard/frontend/models/loop.py	2012-08-22 12:19:55 +0000
+++ dashboard/frontend/models/loop.py	2012-08-24 13:08:33 +0000
@@ -16,8 +16,10 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
+import base64
 from django.db import models
 from jenkinsserver.models.jenkins_server import JenkinsServer
+from lib.logger import Logger
 
 
 class Loop(models.Model):
@@ -26,8 +28,16 @@
 
     name = models.CharField(max_length=200, unique=True)
     server = models.ForeignKey(JenkinsServer)
-
-    def schedule_build(self):
+    is_restricted = models.BooleanField(default=False,
+                                        verbose_name='Build is restricted')
+    is_official = models.BooleanField(default=False,
+                                      verbose_name='Build is official')
+
+    def __init__(self, *args, **kwargs):
+        self.log = Logger.getClassLogger(self)
+        super(Loop, self).__init__(*args, **kwargs)
+
+    def schedule_build(self, parameters=None):
         '''Add a LoopBuild record for this Loop.
 
         Also try to send a build job signal to the server, but if it fails,
@@ -40,7 +50,8 @@
         build.duration = 0.00
         build.save()
         try:
-            build.remote_number = self.server.schedule_job_build(self.name)
+            build.remote_number = self.server.schedule_job_build(self.name,
+                                                                 parameters)
             build.save()
         except:
             # TODO: Log error.
@@ -57,3 +68,13 @@
 
     def __repr__(self):
         return "%s(id=%d, ...)" % (self.__class__.__name__, self.id)
+
+    def base64_config(self):
+        """ Return loop configuration as base64 encoded string.
+        """
+        text_config = u''
+        for field in self._meta.fields:
+            if not field.name in self.EXCLUDE_LIST:
+                text_config += u'%s=%s\n' % (field.name.upper(),
+                                             field.value_to_string(self))
+        return base64.b64encode(text_config)

=== modified file 'dashboard/frontend/urls.py'
--- dashboard/frontend/urls.py	2012-08-16 15:12:10 +0000
+++ dashboard/frontend/urls.py	2012-08-24 13:08:33 +0000
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.conf.urls.defaults import patterns, include, url
+from django.conf.urls.defaults import patterns, url
 from frontend.views.home_page_view import HomePageView
 from frontend.views.index_view import IndexView
 from frontend.views.loop_build_view import LoopBuildView

=== modified file 'dashboard/jenkinsserver/models/jenkins_server.py'
--- dashboard/jenkinsserver/models/jenkins_server.py	2012-08-22 12:19:55 +0000
+++ dashboard/jenkinsserver/models/jenkins_server.py	2012-08-24 13:08:33 +0000
@@ -18,13 +18,13 @@
 
 from django.db import models
 from django.conf import settings
-from xml.dom.minidom import parse, parseString
 import jenkins
 import json
 import urllib2
 from lib.logger import Logger
 from lib.template import TextTemplate, XMLTemplate
 
+
 class JenkinsServer(models.Model):
     class Meta:
         app_label = 'jenkinsserver'
@@ -40,7 +40,7 @@
                                        self.username.encode('utf-8'),
                                        self.password.encode('utf-8'))
 
-    def create_or_update_integration_loop(self, loop):
+    def create_or_update_loop(self, loop):
         """ Create integration loop if it doesn't exist on Jenkins.
         Otherwise, update the existing one with new XML."""
 
@@ -100,22 +100,32 @@
 
     def create_job_xml(self, loop):
         "Prepare the config.xml to be used for the job."
-        # Use loop's class name as the template name - JenkinsServer
-        # still doesn't have any internal knowledge about loop
+        # Get generic serialization data.
+        loop_params = loop.json()
+
         template_name = loop.__class__.__name__
-        # Get generic serialization data - Loop still doesn't know
-        # about Jenkins
-        loop_params = loop.json()
-        build_script = TextTemplate(settings.BUILD_SCRIPT_TEMPLATE \
-                        % template_name).render(loop_params)
-        job_params = {"build_script": build_script}
-        job_params.update(loop_params)
+
+        # We need to handle the CONFIG parameter as a base64 encoded string.
+        # At the moment used only by Android builds.
+        loop_params['base64_config'] = loop.base64_config()
+
+        # Check if the build is restricted, assign appropriate nodes.
+        if loop.is_restricted:
+            loop_params['assigned_node'] = 'private &amp;&amp; natty'
+        else:
+            loop_params['assigned_node'] = 'ec2'
+
+        build_script = TextTemplate(settings.BUILD_SCRIPT_TEMPLATE\
+            % template_name).render(loop_params)
+        loop_params['build_script'] = build_script
+
         xml = XMLTemplate(settings.JENKINS_JOB_TEMPLATE \
-               % template_name).render(job_params)
+               % template_name).render(loop_params)
+
         return xml
 
-    def schedule_job_build(self, jobname):
+    def schedule_job_build(self, jobname, parameters=None):
         """Trigger build job on jenkins. Return the next build number."""
-        self.jenkins.build_job(jobname)
+        self.jenkins.build_job(jobname, parameters)
         job_info = self.jenkins.get_job_info(jobname)
         return job_info["nextBuildNumber"]

=== modified file 'dashboard/jenkinsserver/tests/test_jenkins_server.py'
--- dashboard/jenkinsserver/tests/test_jenkins_server.py	2012-08-21 17:47:38 +0000
+++ dashboard/jenkinsserver/tests/test_jenkins_server.py	2012-08-24 13:08:33 +0000
@@ -54,7 +54,6 @@
         loop.branch = 'lp:linaro-ci-dashboard'
         loop.precommand = 'cd %s' % loop.branch
         loop.command = 'make syncdb; make test'
-        jbranch = 'bzr branch lp:%s dest_dir' % loop.branch
         dest_dir = 'dest_dir'
         env_cmds = "export USER=`whoami`;\nexport HOME=/home/$USER"
 
@@ -85,8 +84,6 @@
         loop.branch = 'linaro-ci-dashboard'
         loop.precommand = 'cd %s' % loop.branch
         loop.command = 'make syncdb; make test'
-        jbranch = 'bzr branch lp:%s' % loop.branch
-        jcommands = '\n'.join([jbranch,  loop.precommand, loop.command])
         jxml = self.server.create_job_xml(loop)
         self.server.create_job(loop.name, jxml)
         self.assertTrue(self.test_jenkins.job_exists(loop.name) == True)

=== added file 'dashboard/lib/template.py'
--- dashboard/lib/template.py	1970-01-01 00:00:00 +0000
+++ dashboard/lib/template.py	2012-08-24 13:08:33 +0000
@@ -0,0 +1,39 @@
+# Copyright (C) 2012 Linaro
+#
+# This file is part of linaro-ci-dashboard.
+#
+# linaro-ci-dashboard is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# linaro-ci-dashboard is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
+# Django settings for dashboard project.
+
+class AbstractTemplate(object):
+    "Template class interface."
+
+    def render(self, dict):
+        pass
+
+
+class TextTemplate(AbstractTemplate):
+
+    def __init__(self, filename):
+        f = open(filename)
+        self.tmpl = f.read()
+        f.close()
+
+    def render(self, dict):
+        return self.tmpl.format(**dict)
+
+
+class XMLTemplate(TextTemplate):
+    """Initial XML templating implementation is based in plain text
+    templates, TODO: fix this!"""

=== removed file 'dashboard/lib/template.py'
--- dashboard/lib/template.py	2012-08-22 12:19:55 +0000
+++ dashboard/lib/template.py	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-# Copyright (C) 2012 Linaro
-#
-# This file is part of linaro-ci-dashboard.
-#
-# linaro-ci-dashboard is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# linaro-ci-dashboard is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with linaro-ci-dashboard.  If not, see <http://www.gnu.org/licenses/>.
-# Django settings for dashboard project.
-
-class AbstractTemplate(object):
-    "Template class interface."
-
-    def render(self, dict):
-        pass
-
-
-class TextTemplate(AbstractTemplate):
-
-    def __init__(self, filename):
-        f = open(filename)
-        self.tmpl = f.read()
-        f.close()
-
-    def render(self, dict):
-        return self.tmpl.format(**dict)
-
-
-class XMLTemplate(TextTemplate):
-    """Initial XML templating implementation is based in plain text
-    templates, TODO: fix this!"""