commit ba1a7dae57d29f73a91109ca0ba71bfc7ef0d3cb
author Gav <gavin@16degrees.com.au> Sun Mar 26 08:14:35 2017 +1100
committer GitHub <noreply@github.com> Sun Mar 26 08:14:35 2017 +1100
tree 50e6c5d5824934dc30185bc92ebaa2508f9f70c4
parent 5148e961829e929fef3f2f0f3e54bcff086fbc57

a few tweaks

move jdk definition to global. other minor tweaks

Jenkinsfile

diff --git a/Jenkinsfile b/Jenkinsfile
index eeb7468..30047e9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,10 +18,13 @@
  */
 
 try {
+        
+// define variables here for global use
+def JAVA_JDK_8=tool name: 'JDK 1.8 (latest)', type: 'hudson.model.JDK'
+        
 node('Windows') {
-        def JAVA_JDK_8=tool name: 'JDK 1.8 (latest)', type: 'hudson.model.JDK'
         echo "Testing with Java $JAVA_JDK_8"
-        stage('JAVA'){
+        stage('JAVA 1.8 (Latest) on Windows'){
         withEnv(["Path+JDK=$JAVA_JDK_8\\bin","JAVA_HOME=$JAVA_JDK_8"]) {
                 bat "echo %JAVA_HOME%"
                 }
@@ -29,11 +32,10 @@
     } // end node Windows
 
 node('ubuntu') {
-        def JAVA_JDK_8=tool name: 'JDK 1.8 (latest)', type: 'hudson.model.JDK'
         echo "Testing with Java $JAVA_JDK_8"
-        stage('JAVA'){
-        withEnv(["Path+JDK=$JAVA_JDK_8\\bin","JAVA_HOME=$JAVA_JDK_8"]) {
-                sh "echo %JAVA_HOME%"
+        stage('JAVA 1.8 (Latest) on Ubuntu'){
+        withEnv(["Path+JDK=$JAVA_JDK_8/bin","JAVA_HOME=$JAVA_JDK_8"]) {
+                sh "echo $JAVA_HOME"
                 }
         } //end stage JAVA
     } // end node ubuntu