Update Jenkins Node: MacOSX (amd64) running Oracle JDK 8

3 files changed, 14 insertions, 9 deletions

diff --git a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/profile.ant b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/profile.ant
new file mode 100755
index 0000000..85027cd
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/profile.ant
@@ -0,0 +1,5 @@
+# /etc/profile.ant
+
+export ANT_PATH=/opt-share/apache-ant
+export ANT_HOME=$ANT_PATH
+export PATH=$ANT_PATH/bin:$PATH
diff --git a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins-012.sh b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins-012.sh
index 73a0fb9..7259e12 100755
--- a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins-012.sh
+++ b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins-012.sh
@@ -2,14 +2,13 @@
 
 cd /Users/jogamp/jenkins
 
-scp [email protected]:/srv/jenkins/war/WEB-INF/slave.jar slave-012.jar
+#scp [email protected]:/srv/jenkins/war/WEB-INF/slave.jar slave-012.jar
+curl -o agent-012.jar https://jogamp.org/chuck/jnlpJars/agent.jar
 
-. /opt-share/etc/profile.ant
-JAVA_HOME=`/usr/libexec/java_home -version 1.6`
+. ./profile.ant
+JAVA_HOME=`/usr/libexec/java_home`
 PATH=$JAVA_HOME/bin:$PATH
 export JAVA_HOME PATH
-#JAVA7_EXE=`/usr/libexec/java_home -version 1.7.0_12`/bin/java
-#export JAVA7_EXE
 export SOURCE_LEVEL=1.6
 export TARGET_LEVEL=1.6
 export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
@@ -21,5 +20,5 @@ which git
 ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" [email protected] -L 6012:localhost:5555 -N &
 SSHPID=$!
 echo Launched SSH $SSHPID
-java -server -Xmx1024m -jar slave-012.jar -jnlpUrl https://jogamp.org/chuck/computer/macosx64-NV320M-10_6-jogamp-x64-sgothel-012/slave-agent.jnlp
+java -server -Xmx1024m -XX:+UseCompressedOops -jar agent-012.jar -jnlpUrl https://jogamp.org/chuck/computer/macosx64-NV320M-10_6-jogamp-x64-sgothel-012/slave-agent.jnlp
 
diff --git a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins-013.sh b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins-013.sh
index a4c3d9d..d490ec0 100755
--- a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins-013.sh
+++ b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins-013.sh
@@ -2,9 +2,10 @@
 
 cd /Users/jogamp/jenkins
 
-scp [email protected]:/srv/jenkins/war/WEB-INF/slave.jar slave-013.jar
+#scp [email protected]:/srv/jenkins/war/WEB-INF/slave.jar slave-013.jar
+curl -o agent-013.jar https://jogamp.org/chuck/jnlpJars/agent.jar
 
-. /opt-share/etc/profile.ant
+. ./profile.ant
 JAVA_HOME=`/usr/libexec/java_home -version 1.8`
 PATH=$JAVA_HOME/bin:$PATH
 export JAVA_HOME PATH
@@ -19,6 +20,6 @@ which git
 ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" [email protected] -L 6013:localhost:5555 -N &
 SSHPID=$!
 echo Launched SSH $SSHPID
-java -server -Xmx1024m -jar slave-013.jar -jnlpUrl https://jogamp.org/chuck/computer/macosx64-NV320M-10_7-jogamp-x64-jre7-sgothel-013/slave-agent.jnlp
+java -server -Xmx1024m -XX:+UseCompressedOops -jar agent-013.jar -jnlpUrl https://jogamp.org/chuck/computer/macosx64-NV320M-10_7-jogamp-x64-jre8-sgothel-013/slave-agent.jnlp