[JENKINS-8996] Include OS type and version of slave in the system inf…

…ormation page.
jenkinsci · Mar 13, 2011 · 51beb72 · 51beb72
1 parent 779e113
commit 51beb72
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/changelog.html b/changelog.html
@@ -91,6 +91,9 @@
     Added an option to aggregated test results to include failed builds as well as passing and unstable builds.
   <li class=rfe>
     Added autocompletion to "Build after other projects" textbox, with support for "autoCompleteField" on textboxes without a true field.
+  <li class=rfe>
+      Include OS type and version of slave in the system information page.
+    (<a href="http://issues.jenkins-ci.org/browse/JENKINS-8996">issue 8996</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 

diff --git a/core/src/main/java/hudson/slaves/SlaveComputer.java b/core/src/main/java/hudson/slaves/SlaveComputer.java
@@ -514,6 +514,20 @@ protected ComputerLauncher grabLauncher(Node node) {
         return ((Slave)node).getLauncher();
     }
 
+    /**
+     * Get the slave version
+     */
+    public String getSlaveVersion() throws IOException, InterruptedException {
+        return channel.call(new SlaveVersion());
+    }
+
+    /**
+     * Get the OS description.
+     */
+    public String getOSDescription() throws IOException, InterruptedException {
+        return channel.call(new DetectOS()) ? "Unix" : "Windows";
+    }
+
     private static final Logger logger = Logger.getLogger(SlaveComputer.class.getName());
 
     private static final class SlaveVersion implements Callable<String,IOException> {

diff --git a/core/src/main/resources/hudson/slaves/SlaveComputer/systemInfo.jelly b/core/src/main/resources/hudson/slaves/SlaveComputer/systemInfo.jelly
@@ -33,6 +33,7 @@ THE SOFTWARE.
 
     <l:main-panel>
       <l:isAdmin>
+        <h1>${it.oSDescription} slave, version ${it.slaveVersion}</h1>
         <h1>${%System Properties}</h1>
         <t:propertyTable items="${it.systemProperties}" />
         <h1>${%Environment Variables}</h1>