Merge lp:~pfalcon/linaro-android-build-tools/final-build-step into lp:linaro-android-build-tools

Proposed by Paul Sokolovsky
Status: Merged
Approved by: Deepti B. Kalakeri
Approved revision: 487
Merged at revision: 487
Proposed branch: lp:~pfalcon/linaro-android-build-tools/final-build-step
Merge into: lp:linaro-android-build-tools
Diff against target: 13 lines (+4/-0)
1 file modified
utils/mangle-jobs/builders.xml (+4/-0)
To merge this branch: bzr merge lp:~pfalcon/linaro-android-build-tools/final-build-step
Reviewer Review Type Date Requested Status
Stevan Radaković Pending
Linaro Infrastructure Pending
Review via email: mp+109648@code.launchpad.net

Description of the change

This change is the next step towards resolving lp:940226 - provided migration script will allow to find a point in which regular lockups occur - either in SSH transfer step, or after user-defined build steps finish, somewhere in core Jenkins code.

To post a comment you must log in.
Revision history for this message
Данило Шеган (danilo) wrote :

Paul, thanks for working on this. Is newline required before </command> like that?

Revision history for this message
Deepti B. Kalakeri (deeptik) wrote :

I have seen the same syntax in the jobs config generated by jenkins where the </command> is in the newline. Am not sure if changing it to be in the same line as <command> would make a difference or give any syntax problems. But, in general the changes looks good +1.

Revision history for this message
Deepti B. Kalakeri (deeptik) wrote :

I agree with Danilo, we can bring the </command> directive in the same line and it would work.

Revision history for this message
Paul Sokolovsky (pfalcon) wrote :

> Paul, thanks for working on this. Is newline required before </command> like that?

Well, I just copied that from actual Jenkins config, and yes, it's apparently encodes newline between commands. In this specific case it is trailing, so might be possible to fold, or maybe not, depends on how Jenkins interprets it.

Revision history for this message
Deepti B. Kalakeri (deeptik) wrote :

On Thu, Jun 14, 2012 at 3:35 PM, Paul Sokolovsky <<email address hidden>
> wrote:

> > Paul, thanks for working on this. Is newline required before </command>
> like that?
>
> Well, I just copied that from actual Jenkins config, and yes, it's
> apparently encodes newline between commands. In this specific case it is
> trailing, so might be possible to fold, or maybe not, depends on how
> Jenkins interprets it.
>

I have verified this and jenkins interprets it correctly even if </command>
is in the same line.

>
> --
>
> https://code.launchpad.net/~pfalcon/linaro-android-build-tools/final-build-step/+merge/109648<https://code.launchpad.net/%7Epfalcon/linaro-android-build-tools/final-build-step/+merge/109648>
> Your team Linaro Infrastructure is requested to review the proposed merge
> of lp:~pfalcon/linaro-android-build-tools/final-build-step into
> lp:linaro-android-build-tools.
>

--
Thanks and Regards,
Deepti

Revision history for this message
Deepti B. Kalakeri (deeptik) wrote :

As discussed with Paul on IRC, lets keep the default jenkins syntax.
Looks good +1.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'utils/mangle-jobs/sftp-as-build-step.mangle' => 'utils/mangle-jobs/build-steps-set.mangle'
2=== modified file 'utils/mangle-jobs/builders.xml'
3--- utils/mangle-jobs/builders.xml 2012-05-17 12:14:23 +0000
4+++ utils/mangle-jobs/builders.xml 2012-06-11 14:29:23 +0000
5@@ -129,4 +129,8 @@
6 </delegate>
7 </delegate>
8 </jenkins.plugins.publish__over__ssh.BapSshBuilderPlugin>
9+ <hudson.tasks.Shell>
10+ <command>echo &quot;Build finished&quot;
11+</command>
12+ </hudson.tasks.Shell>
13 </builders>

Subscribers

People subscribed via source and target branches