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

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
=== modified file 'utils/mangle-jobs/builders.xml'
--- utils/mangle-jobs/builders.xml 2012-01-12 19:07:10 +0000
+++ utils/mangle-jobs/builders.xml 2012-05-17 13:00:25 +0000
@@ -1,23 +1,23 @@
1 <builders>1 <builders>
2 <hudson.tasks.Shell>2 <hudson.plugins.shell.ShellWithStatus>
3 <command>rm -rf build-tools3 <command>rm -rf build-tools
4bzr get lp:linaro-android-build-tools build-tools4bzr get lp:linaro-android-build-tools build-tools
5build-tools/node/build us-east-1.ec2-git-mirror.linaro.org &quot;$CONFIG&quot;5build-tools/node/build us-east-1.ec2-git-mirror.linaro.org &quot;$CONFIG&quot;
6#build-tools/node/build &quot;$HUDSON_URL&quot; &quot;$CONFIG&quot;6#build-tools/node/build &quot;$HUDSON_URL&quot; &quot;$CONFIG&quot;
7</command>7</command>
8 </hudson.tasks.Shell>8 </hudson.plugins.shell.ShellWithStatus>
9 <jenkins.plugins.publish__over__ssh.BapSshBuilderPlugin>9 <jenkins.plugins.publish__over__ssh.BapSshBuilderPlugin>
10 <delegate>10 <delegate>
11 <consolePrefix>SSH: </consolePrefix>11 <consolePrefix>SSH: </consolePrefix>
12 <delegate>12 <delegate>
13 <publishers>13 <publishers>
14 <jenkins.plugins.publish__over__ssh.BapSshPublisher>14 <jenkins.plugins.publish__over__ssh.BapSshPublisher>
15 <configName>snapshots.linaro.org</configName>15 <configName>snapshots.linaro.org new</configName>
16 <verbose>false</verbose>16 <verbose>false</verbose>
17 <transfers>17 <transfers>
18 <jenkins.plugins.publish__over__ssh.BapSshTransfer>18 <jenkins.plugins.publish__over__ssh.BapSshTransfer>
19 <remoteDirectory>${JOB_NAME}/${BUILD_NUMBER}</remoteDirectory>19 <remoteDirectory>android/${JOB_NAME}/${BUILD_NUMBER}</remoteDirectory>
20 <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>20 <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>
21 <excludes></excludes>21 <excludes></excludes>
22 <removePrefix>build/out</removePrefix>22 <removePrefix>build/out</removePrefix>
23 <remoteDirectorySDF>false</remoteDirectorySDF>23 <remoteDirectorySDF>false</remoteDirectorySDF>
@@ -32,7 +32,7 @@
32 <usePromotionTimestamp>false</usePromotionTimestamp>32 <usePromotionTimestamp>false</usePromotionTimestamp>
33 </jenkins.plugins.publish__over__ssh.BapSshPublisher>33 </jenkins.plugins.publish__over__ssh.BapSshPublisher>
34 <jenkins.plugins.publish__over__ssh.BapSshPublisher>34 <jenkins.plugins.publish__over__ssh.BapSshPublisher>
35 <configName>snapshots.linaro.org file-move</configName>35 <configName>snapshots.linaro.org file-move new</configName>
36 <verbose>false</verbose>36 <verbose>false</verbose>
37 <transfers>37 <transfers>
38 <jenkins.plugins.publish__over__ssh.BapSshTransfer>38 <jenkins.plugins.publish__over__ssh.BapSshTransfer>
@@ -43,7 +43,7 @@
43 <remoteDirectorySDF>false</remoteDirectorySDF>43 <remoteDirectorySDF>false</remoteDirectorySDF>
44 <flatten>false</flatten>44 <flatten>false</flatten>
45 <cleanRemote>false</cleanRemote>45 <cleanRemote>false</cleanRemote>
46 <execCommand>reshuffle-files ${JOB_NAME}/${BUILD_NUMBER}</execCommand>46 <execCommand>reshuffle-files -t android -j ${JOB_NAME} -n ${BUILD_NUMBER} -m</execCommand>
47 <execTimeout>120000</execTimeout>47 <execTimeout>120000</execTimeout>
48 <usePty>false</usePty>48 <usePty>false</usePty>
49 </jenkins.plugins.publish__over__ssh.BapSshTransfer>49 </jenkins.plugins.publish__over__ssh.BapSshTransfer>
@@ -69,11 +69,11 @@
69 <delegate>69 <delegate>
70 <publishers>70 <publishers>
71 <jenkins.plugins.publish__over__ssh.BapSshPublisher>71 <jenkins.plugins.publish__over__ssh.BapSshPublisher>
72 <configName>snapshots.linaro.org</configName>72 <configName>snapshots.linaro.org new</configName>
73 <verbose>false</verbose>73 <verbose>false</verbose>
74 <transfers>74 <transfers>
75 <jenkins.plugins.publish__over__ssh.BapSshTransfer>75 <jenkins.plugins.publish__over__ssh.BapSshTransfer>
76 <remoteDirectory>${JOB_NAME}/${BUILD_NUMBER}</remoteDirectory>76 <remoteDirectory>android/${JOB_NAME}/${BUILD_NUMBER}</remoteDirectory>
77 <sourceFiles>build/out/lava-job-info</sourceFiles>77 <sourceFiles>build/out/lava-job-info</sourceFiles>
78 <excludes></excludes>78 <excludes></excludes>
79 <removePrefix>build/out</removePrefix>79 <removePrefix>build/out</removePrefix>
@@ -102,7 +102,7 @@
102 <delegate>102 <delegate>
103 <publishers>103 <publishers>
104 <jenkins.plugins.publish__over__ssh.BapSshPublisher>104 <jenkins.plugins.publish__over__ssh.BapSshPublisher>
105 <configName>snapshots.linaro.org file-move</configName>105 <configName>snapshots.linaro.org file-move new</configName>
106 <verbose>false</verbose>106 <verbose>false</verbose>
107 <transfers>107 <transfers>
108 <jenkins.plugins.publish__over__ssh.BapSshTransfer>108 <jenkins.plugins.publish__over__ssh.BapSshTransfer>
@@ -113,7 +113,7 @@
113 <remoteDirectorySDF>false</remoteDirectorySDF>113 <remoteDirectorySDF>false</remoteDirectorySDF>
114 <flatten>false</flatten>114 <flatten>false</flatten>
115 <cleanRemote>false</cleanRemote>115 <cleanRemote>false</cleanRemote>
116 <execCommand>reshuffle-files ${JOB_NAME}/${BUILD_NUMBER}</execCommand>116 <execCommand>reshuffle-files -t android -j ${JOB_NAME} -n ${BUILD_NUMBER} -m</execCommand>
117 <execTimeout>120000</execTimeout>117 <execTimeout>120000</execTimeout>
118 <usePty>false</usePty>118 <usePty>false</usePty>
119 </jenkins.plugins.publish__over__ssh.BapSshTransfer>119 </jenkins.plugins.publish__over__ssh.BapSshTransfer>

Subscribers

People subscribed via source and target branches