Merge lp:~pfalcon/linaro-ci-dashboard/show_node_labels into lp:linaro-ci-dashboard

Proposed by Paul Sokolovsky
Status: Merged
Approved by: Stevan Radaković
Approved revision: 62
Merged at revision: 65
Proposed branch: lp:~pfalcon/linaro-ci-dashboard/show_node_labels
Merge into: lp:linaro-ci-dashboard
Diff against target: 37 lines (+18/-2)
1 file modified
config_template/config.xml (+18/-2)
To merge this branch: bzr merge lp:~pfalcon/linaro-ci-dashboard/show_node_labels
Reviewer Review Type Date Requested Status
Stevan Radaković Approve
Review via email: mp+125186@code.launchpad.net

Description of the change

This patch makes master node management in local jenkins server easier - the corresponding input field will be now shown in global Jenkins config.

To post a comment you must log in.
Revision history for this message
Stevan Radaković (stevanr) wrote :

Looks good.
Not a heartbreaker at the moment but:
Approve +1 :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config_template/config.xml'
2--- config_template/config.xml 2012-07-19 08:00:53 +0000
3+++ config_template/config.xml 2012-09-19 12:40:25 +0000
4@@ -1,7 +1,7 @@
5 <?xml version='1.0' encoding='UTF-8'?>
6 <hudson>
7 <disabledAdministrativeMonitors/>
8- <version>1.474</version>
9+ <version>1.482</version>
10 <numExecutors>2</numExecutors>
11 <mode>NORMAL</mode>
12 <useSecurity>true</useSecurity>
13@@ -20,7 +20,23 @@
14 <viewsTabBar class="hudson.views.DefaultViewsTabBar"/>
15 <myViewsTabBar class="hudson.views.DefaultMyViewsTabBar"/>
16 <clouds/>
17- <slaves/>
18+ <slaves>
19+ <slave>
20+ <name>dummy</name>
21+ <description>This node doesn't build anything, it's sole purpose is to make Jenkins show "labels" input fields in UI.</description>
22+ <remoteFS>/non_existent</remoteFS>
23+ <numExecutors>1</numExecutors>
24+ <mode>NORMAL</mode>
25+ <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
26+ <launcher class="hudson.plugins.sshslaves.SSHLauncher">
27+ <host>127.0.0.1</host>
28+ <port>7</port>
29+ <password>SytI7sBKsmvORjsvPNMo7Q==</password>
30+ </launcher>
31+ <label></label>
32+ <nodeProperties/>
33+ </slave>
34+ </slaves>
35 <quietPeriod>5</quietPeriod>
36 <scmCheckoutRetryCount>0</scmCheckoutRetryCount>
37 <views>

Subscribers

People subscribed via source and target branches