Jenkins: Add OSX/Java7 node (where build is performed w/ source/target 1.6 incl. Java6 rt.jar)

4 files changed, 52 insertions, 24 deletions

diff --git a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012/start-ssh-jenkins.sh b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012/start-ssh-jenkins.sh
deleted file mode 100755
index 0f2349d..0000000
--- a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012/start-ssh-jenkins.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/bash
-
-cd /Users/jogamp/jenkins
-
-scp [email protected]:/srv/jenkins/war/WEB-INF/slave.jar .
-
-function connect_12 {
-  . /opt-share/etc/profile.ant
-  java -version
-  which git
-  sshpid=
-  while true ; do
-    if [ ! -z "$sshpid" ] ; then
-	kill -9 $sshpid
-    fi
-    ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" [email protected] -L 6012:localhost:5555 -N &
-    sshpid=$!
-    java -server -Xmx1024m -jar slave.jar -jnlpUrl https://jogamp.org/chuck/computer/macosx64-NV320M-10_6-jogamp-x64-sgothel-012/slave-agent.jnlp
-  done
-}
-
-connect_12 > macosx64-NV320M-10_6-jogamp-x64-sgothel-012.log 2>&1 &
-disown $!
-
diff --git a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012/README.macosx b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/README.macosx
index a66496e..a66496e 100644
--- a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012/README.macosx
+++ b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/README.macosx
diff --git a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012/macosx-startup-start-ssh-jenkins.command b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/macosx-startup-start-ssh-jenkins.command
index a33f7dc..a33f7dc 100755
--- a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012/macosx-startup-start-ssh-jenkins.command
+++ b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/macosx-startup-start-ssh-jenkins.command
diff --git a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins.sh b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins.sh
new file mode 100755
index 0000000..6b61f0d
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins.sh
@@ -0,0 +1,52 @@
+#! /bin/bash
+
+cd /Users/jogamp/jenkins
+
+scp [email protected]:/srv/jenkins/war/WEB-INF/slave.jar .
+
+function connect_12 {
+  . /opt-share/etc/profile.ant
+  JAVA_HOME=`/usr/libexec/java_home -version 1.6`
+  PATH=$JAVA_HOME/bin:$PATH
+  export JAVA_HOME PATH
+  export SOURCE_LEVEL=1.6
+  export TARGET_LEVEL=1.6
+  export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+  java -version
+  which git
+  sshpid=
+  while true ; do
+    if [ ! -z "$sshpid" ] ; then
+	kill -9 $sshpid
+    fi
+    ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" [email protected] -L 6012:localhost:5555 -N &
+    sshpid=$!
+    java -server -Xmx1024m -jar slave.jar -jnlpUrl https://jogamp.org/chuck/computer/macosx64-NV320M-10_6-jogamp-x64-sgothel-012/slave-agent.jnlp
+  done
+}
+
+function connect_13 {
+  . /opt-share/etc/profile.ant
+  JAVA_HOME=`/usr/libexec/java_home -version 1.7`
+  PATH=$JAVA_HOME/bin:$PATH
+  export JAVA_HOME PATH
+  export SOURCE_LEVEL=1.6
+  export TARGET_LEVEL=1.6
+  export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+  java -version
+  which git
+  sshpid=
+  while true ; do
+    if [ ! -z "$sshpid" ] ; then
+	kill -9 $sshpid
+    fi
+    ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" [email protected] -L 6013:localhost:5555 -N &
+    sshpid=$!
+    java -server -Xmx1024m -jar slave.jar -jnlpUrl https://jogamp.org/chuck/computer/macosx64-NV320M-10_7-jogamp-x64-jre7-sgothel-013/slave-agent.jnlp
+  done
+}
+
+connect_12 > macosx64-NV320M-10_6-jogamp-x64-sgothel-012.log 2>&1 &
+connect_13 > macosx64-NV320M-10_6-jogamp-x64-jre7-sgothel-013.log 2>&1 &
+disown $!
+