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
=== modified file 'config_template/config.xml'
--- config_template/config.xml 2012-07-19 08:00:53 +0000
+++ config_template/config.xml 2012-09-19 12:40:25 +0000
@@ -1,7 +1,7 @@
1<?xml version='1.0' encoding='UTF-8'?>1<?xml version='1.0' encoding='UTF-8'?>
2<hudson>2<hudson>
3 <disabledAdministrativeMonitors/>3 <disabledAdministrativeMonitors/>
4 <version>1.474</version>4 <version>1.482</version>
5 <numExecutors>2</numExecutors>5 <numExecutors>2</numExecutors>
6 <mode>NORMAL</mode>6 <mode>NORMAL</mode>
7 <useSecurity>true</useSecurity>7 <useSecurity>true</useSecurity>
@@ -20,7 +20,23 @@
20 <viewsTabBar class="hudson.views.DefaultViewsTabBar"/>20 <viewsTabBar class="hudson.views.DefaultViewsTabBar"/>
21 <myViewsTabBar class="hudson.views.DefaultMyViewsTabBar"/>21 <myViewsTabBar class="hudson.views.DefaultMyViewsTabBar"/>
22 <clouds/>22 <clouds/>
23 <slaves/>23 <slaves>
24 <slave>
25 <name>dummy</name>
26 <description>This node doesn't build anything, it's sole purpose is to make Jenkins show "labels" input fields in UI.</description>
27 <remoteFS>/non_existent</remoteFS>
28 <numExecutors>1</numExecutors>
29 <mode>NORMAL</mode>
30 <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
31 <launcher class="hudson.plugins.sshslaves.SSHLauncher">
32 <host>127.0.0.1</host>
33 <port>7</port>
34 <password>SytI7sBKsmvORjsvPNMo7Q==</password>
35 </launcher>
36 <label></label>
37 <nodeProperties/>
38 </slave>
39 </slaves>
24 <quietPeriod>5</quietPeriod>40 <quietPeriod>5</quietPeriod>
25 <scmCheckoutRetryCount>0</scmCheckoutRetryCount>41 <scmCheckoutRetryCount>0</scmCheckoutRetryCount>
26 <views>42 <views>

Subscribers

People subscribed via source and target branches