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

…ormation page.
jenkinsci · Apr 7, 2011 · f54668f · f54668f
1 parent c0643de
commit f54668f
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 0 deletions.
diff --git a/changelog.html b/changelog.html
@@ -64,6 +64,24 @@
   <li class=rfe>
     Proactively watch out for incomplete extensions to avoid cryptic NPE.
     (<a href="http://issues.jenkins-ci.org/browse/JENKINS-8866">issue 8866</a>)
+  <li class=rfe>
+    Added more event callbacks on <tt>ComputerListener</tt>
+    (<a href="http://jenkins.361315.n4.nabble.com/Hooking-into-failed-slave-launches-td3339646.html">thread</a>)
+  <li class=rfe>
+    Improved the auto-completion for creating a job by copying.
+  <li class=rfe>
+    Improved the performance of the configuration page rendering by lazy-loading fragments.
+  <li class=rfe>
+    Introduced a behind-the-scene mechanism to lazy-load portions of HTML pages.
+  <li class=rfe>
+    Introduced a behind-the-scene mechanism to simplify server/client communication through JavaScript proxies.
+  <li class=rfe>
+    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
@@ -508,6 +508,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>