Linaro Android Build Tools

Merge lp:~pfalcon/linaro-android-build-tools/migrate-new-pub into lp:linaro-android-build-tools

  1. migrate-new-pub
  2. Merge into trunk
Proposed by Paul Sokolovsky
Status: Merged
Merged at revision: 472
Proposed branch: lp:~pfalcon/linaro-android-build-tools/migrate-new-pub
Merge into: lp:linaro-android-build-tools
Diff against target: 82 lines (+11/-11)
1 file modified
utils/mangle-jobs/builders.xml (+11/-11)
To merge this branch: bzr merge lp:~pfalcon/linaro-android-build-tools/migrate-new-pub
Reviewer Review Type Date Requested Status
Fathi Boudra Approve
Linaro Infrastructure Pending
Review via email: mp+106174@code.launchpad.net

This proposal supersedes a proposal from 2012-05-17.

Description of the change

Migration script (actually, only updated data) to switch to new publishing script consistently on android-build.

To post a comment you must log in.
Revision history for this message
Fathi Boudra (fboudra) wrote :

Approved.

"snapshots.linaro.org file-move new" is using linaro-android-build-publish account.
Does it still make sense to have 2 accounts (linaro-ci-publish) duplicating the same thing?
We deploy linaro-license-protection on both accounts and use them in the same way.

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

> Does it still make sense to have 2 accounts (linaro-ci-publish) duplicating the same thing?

AFAIK, it's IS thing, and done for security reasons. They have accounts config tight - e.g., check the exact source address for connections. So, let's start with tearing off 3rd account we have there (for sh-based publisher script) which we no longer need.

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

Deployed.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'utils/mangle-jobs/builders.xml'
2--- utils/mangle-jobs/builders.xml 2012-01-12 19:07:10 +0000
3+++ utils/mangle-jobs/builders.xml 2012-05-17 13:00:25 +0000
4@@ -1,23 +1,23 @@
5 <builders>
6- <hudson.tasks.Shell>
7+ <hudson.plugins.shell.ShellWithStatus>
8 <command>rm -rf build-tools
9 bzr get lp:linaro-android-build-tools build-tools
10 build-tools/node/build us-east-1.ec2-git-mirror.linaro.org &quot;$CONFIG&quot;
11 #build-tools/node/build &quot;$HUDSON_URL&quot; &quot;$CONFIG&quot;
12 </command>
13- </hudson.tasks.Shell>
14+ </hudson.plugins.shell.ShellWithStatus>
15 <jenkins.plugins.publish__over__ssh.BapSshBuilderPlugin>
16 <delegate>
17 <consolePrefix>SSH: </consolePrefix>
18 <delegate>
19 <publishers>
20 <jenkins.plugins.publish__over__ssh.BapSshPublisher>
21- <configName>snapshots.linaro.org</configName>
22+ <configName>snapshots.linaro.org new</configName>
23 <verbose>false</verbose>
24 <transfers>
25 <jenkins.plugins.publish__over__ssh.BapSshTransfer>
26- <remoteDirectory>${JOB_NAME}/${BUILD_NUMBER}</remoteDirectory>
27- <sourceFiles>build/out/target/*/*/*.img,build/out/target/*/*/*.tar.bz2,build/out/target/*/*/MD5SUMS,build/out/*.tar.bz2,build/out/*.xml,build/out/*_config,build/out/lava-job-info</sourceFiles>
28+ <remoteDirectory>android/${JOB_NAME}/${BUILD_NUMBER}</remoteDirectory>
29+ <sourceFiles>build/out/target/*/*/*.img,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>
30 <excludes></excludes>
31 <removePrefix>build/out</removePrefix>
32 <remoteDirectorySDF>false</remoteDirectorySDF>
33@@ -32,7 +32,7 @@
34 <usePromotionTimestamp>false</usePromotionTimestamp>
35 </jenkins.plugins.publish__over__ssh.BapSshPublisher>
36 <jenkins.plugins.publish__over__ssh.BapSshPublisher>
37- <configName>snapshots.linaro.org file-move</configName>
38+ <configName>snapshots.linaro.org file-move new</configName>
39 <verbose>false</verbose>
40 <transfers>
41 <jenkins.plugins.publish__over__ssh.BapSshTransfer>
42@@ -43,7 +43,7 @@
43 <remoteDirectorySDF>false</remoteDirectorySDF>
44 <flatten>false</flatten>
45 <cleanRemote>false</cleanRemote>
46- <execCommand>reshuffle-files ${JOB_NAME}/${BUILD_NUMBER}</execCommand>
47+ <execCommand>reshuffle-files -t android -j ${JOB_NAME} -n ${BUILD_NUMBER} -m</execCommand>
48 <execTimeout>120000</execTimeout>
49 <usePty>false</usePty>
50 </jenkins.plugins.publish__over__ssh.BapSshTransfer>
51@@ -69,11 +69,11 @@
52 <delegate>
53 <publishers>
54 <jenkins.plugins.publish__over__ssh.BapSshPublisher>
55- <configName>snapshots.linaro.org</configName>
56+ <configName>snapshots.linaro.org new</configName>
57 <verbose>false</verbose>
58 <transfers>
59 <jenkins.plugins.publish__over__ssh.BapSshTransfer>
60- <remoteDirectory>${JOB_NAME}/${BUILD_NUMBER}</remoteDirectory>
61+ <remoteDirectory>android/${JOB_NAME}/${BUILD_NUMBER}</remoteDirectory>
62 <sourceFiles>build/out/lava-job-info</sourceFiles>
63 <excludes></excludes>
64 <removePrefix>build/out</removePrefix>
65@@ -102,7 +102,7 @@
66 <delegate>
67 <publishers>
68 <jenkins.plugins.publish__over__ssh.BapSshPublisher>
69- <configName>snapshots.linaro.org file-move</configName>
70+ <configName>snapshots.linaro.org file-move new</configName>
71 <verbose>false</verbose>
72 <transfers>
73 <jenkins.plugins.publish__over__ssh.BapSshTransfer>
74@@ -113,7 +113,7 @@
75 <remoteDirectorySDF>false</remoteDirectorySDF>
76 <flatten>false</flatten>
77 <cleanRemote>false</cleanRemote>
78- <execCommand>reshuffle-files ${JOB_NAME}/${BUILD_NUMBER}</execCommand>
79+ <execCommand>reshuffle-files -t android -j ${JOB_NAME} -n ${BUILD_NUMBER} -m</execCommand>
80 <execTimeout>120000</execTimeout>
81 <usePty>false</usePty>
82 </jenkins.plugins.publish__over__ssh.BapSshTransfer>

Subscribers

People subscribed via source and target branches