Update Jenkins Nodes: Windows NVidia and Linux (amd64, i386, arm*, android*)

- Windows Node has been updated to Windows 10, only 64bit is enabled for now.
- Linux Node has been updated to Debian 9, only 64bit is enabled for now + arm7hf and android builds.

7 files changed, 73 insertions, 38 deletions

diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/profile.amd64.j2se8 b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/profile.amd64.j2se8
new file mode 100644
index 0000000..e5c2cd1
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/profile.amd64.j2se8
@@ -0,0 +1,16 @@
+unset NS_JAVA
+unset DYN_JAVA
+unset JAVA_ROOT
+unset JAVA_BINDIR
+unset JDK_HOME
+unset JAVA_COMPILER
+unset TYA_LOGFILE
+
+# export LIBXCB_ALLOW_SLOPPY_LOCK=1
+
+export CLASSPATH=.
+
+#export JAVA_HOME=/opt-linux-x86_64/j2se8
+export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
+
+export PATH=$JAVA_HOME/bin:$PATH
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/profile.ant b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/profile.ant
new file mode 100644
index 0000000..85027cd
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/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-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/profile.i386.j2se8 b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/profile.i386.j2se8
new file mode 100644
index 0000000..bd95e81
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/profile.i386.j2se8
@@ -0,0 +1,16 @@
+unset NS_JAVA
+unset DYN_JAVA
+unset JAVA_ROOT
+unset JAVA_BINDIR
+unset JDK_HOME
+unset JAVA_COMPILER
+unset TYA_LOGFILE
+
+# export LIBXCB_ALLOW_SLOPPY_LOCK=1
+
+export CLASSPATH=.
+
+#export JAVA_HOME=/opt-linux-x86/j2se8
+export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-i386
+
+export PATH=$JAVA_HOME/bin:$PATH
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh
index 4149017..34c1469 100755
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh
@@ -4,12 +4,12 @@ cd ~/jenkins
 
 JENKINS_NODE_STARTUP_DIR=`pwd`
 
-scp [email protected]:/srv/jenkins/war/WEB-INF/slave.jar .
+#scp [email protected]:/srv/jenkins/war/WEB-INF/slave.jar .
+curl -O https://jogamp.org/chuck/jnlpJars/agent.jar
 
 function connect_1 {
-  . /opt-share/etc/profile.ant
-  . /opt-linux-x86/etc/profile.jre8
-  . /opt-linux-x86/etc/profile.j2se8
+  . ./profile.ant
+  . ./profile.i386.j2se8
 
   export SOURCE_LEVEL=1.6
   export TARGET_LEVEL=1.6
@@ -25,14 +25,13 @@ function connect_1 {
     fi
     ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" [email protected] -L 6001:localhost:5555 -N &
     sshpid=$!
-    java -server -Xmx512m -jar slave.jar -jnlpUrl https://jogamp.org/chuck/computer/linux64-AMD58xx-debian7-jogamp-x32-sgothel-001/slave-agent.jnlp
+    java -server -Xmx512m -XX:+UseCompressedOops -jar agent.jar -jnlpUrl https://jogamp.org/chuck/computer/linux64-AMD58xx-debian7-jogamp-x32-sgothel-001/slave-agent.jnlp
   done
 }
 
 function connect_2 {
-  . /opt-share/etc/profile.ant
-  . /opt-linux-x86_64/etc/profile.jre8
-  . /opt-linux-x86_64/etc/profile.j2se8
+  . ./profile.ant
+  . ./profile.amd64.j2se8
 
   export SOURCE_LEVEL=1.6
   export TARGET_LEVEL=1.6
@@ -48,14 +47,13 @@ function connect_2 {
     fi
     ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" [email protected] -L 6002:localhost:5555 -N &
     sshpid=$!
-    java -server -Xmx512m -jar slave.jar -jnlpUrl https://jogamp.org/chuck/computer/linux64-AMD58xx-debian7-jogamp-x64-sgothel-002/slave-agent.jnlp
+    java -server -Xmx512m -XX:+UseCompressedOops -jar agent.jar -jnlpUrl https://jogamp.org/chuck/computer/linux64-AMD58xx-debian7-jogamp-x64-sgothel-002/slave-agent.jnlp 
   done
 }
 
 function connect_30 {
-  . /opt-share/etc/profile.ant
-  . /opt-linux-x86_64/etc/profile.jre8
-  . /opt-linux-x86_64/etc/profile.j2se8
+  . ./profile.ant
+  . ./profile.amd64.j2se8
 
   export SOURCE_LEVEL=1.6
   export TARGET_LEVEL=1.6
@@ -96,14 +94,13 @@ function connect_30 {
     fi
     ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" [email protected] -L 6030:localhost:5555 -N &
     sshpid=$!
-    java -server -Xmx512m -jar slave.jar -jnlpUrl https://jogamp.org/chuck/computer/linuxARMv7-jogamp-arm32-sgothel-030/slave-agent.jnlp
+    java -server -Xmx512m -XX:+UseCompressedOops -jar agent.jar -jnlpUrl https://jogamp.org/chuck/computer/linuxARMv7-jogamp-arm32-sgothel-030/slave-agent.jnlp
   done
 }
 
 function connect_31 {
-  . /opt-share/etc/profile.ant
-  . /opt-linux-x86_64/etc/profile.jre8
-  . /opt-linux-x86_64/etc/profile.j2se8
+  . ./profile.ant
+  . ./profile.amd64.j2se8
 
   export SOURCE_LEVEL=1.6
   export TARGET_LEVEL=1.6
@@ -144,15 +141,14 @@ function connect_31 {
     fi
     ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" [email protected] -L 6031:localhost:5555 -N &
     sshpid=$!
-    java -server -Xmx512m -jar slave.jar -jnlpUrl https://jogamp.org/chuck/computer/linuxARMv7hf-jogamp-arm32hf-sgothel-031/slave-agent.jnlp
+    java -server -Xmx512m -XX:+UseCompressedOops -jar agent.jar -jnlpUrl https://jogamp.org/chuck/computer/linuxARMv7hf-jogamp-arm32hf-sgothel-031/slave-agent.jnlp
   done
 }
 
 
 function connect_40 {
-  . /opt-share/etc/profile.ant
-  . /opt-linux-x86_64/etc/profile.jre8
-  . /opt-linux-x86_64/etc/profile.j2se8
+  . ./profile.ant
+  . ./profile.amd64.j2se8
 
     export NODE_LABEL=label/android-armv7-img
     HOST_ROOT=/home/jogamp/JogAmpSlaveARMv7_Android
@@ -214,15 +210,14 @@ function connect_40 {
     fi
     ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" [email protected] -L 6040:localhost:5555 -N &
     sshpid=$!
-    java -server -Xmx512m -jar slave.jar -jnlpUrl https://jogamp.org/chuck/computer/androidARMv7-jogamp-arm32-sgothel-040/slave-agent.jnlp
+    java -server -Xmx512m -XX:+UseCompressedOops -jar agent.jar -jnlpUrl https://jogamp.org/chuck/computer/androidARMv7-jogamp-arm32-sgothel-040/slave-agent.jnlp
   done
 
 }
 
 function connect_41 {
-  . /opt-share/etc/profile.ant
-  . /opt-linux-x86_64/etc/profile.jre8
-  . /opt-linux-x86_64/etc/profile.j2se8
+  . ./profile.ant
+  . ./profile.amd64.j2se8
 
     export NODE_LABEL=label/android-aarch64
     HOST_ROOT=/home/jogamp/JogAmpSlaveArm64_Android
@@ -282,18 +277,18 @@ function connect_41 {
     fi
     ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" [email protected] -L 6041:localhost:5555 -N &
     sshpid=$!
-    java -server -Xmx512m -jar slave.jar -jnlpUrl https://jogamp.org/chuck/computer/androidArm64-jogamp-aarch64-sgothel-041/slave-agent.jnlp
+    java -server -Xmx512m -XX:+UseCompressedOops -jar agent.jar -jnlpUrl https://jogamp.org/chuck/computer/androidArm64-jogamp-aarch64-sgothel-041/slave-agent.jnlp
   done
 }
 
-connect_1 > linux64-AMD58xx-debian7-jogamp-x32-sgothel-001.log 2>&1 &
-disown $!
+#connect_1 > linux64-AMD58xx-debian7-jogamp-x32-sgothel-001.log 2>&1 &
+#disown $!
 
 connect_2 > linux64-AMD58xx-debian7-jogamp-x64-sgothel-002.log 2>&1 &
 disown $!
 
-connect_30 > linuxARMv7-jogamp-arm32-sgothel-030.log 2>&1 &
-disown $!
+#connect_30 > linuxARMv7-jogamp-arm32-sgothel-030.log 2>&1 &
+#disown $!
 
 connect_31 > linuxARMv7hf-jogamp-arm32hf-sgothel-031.log 2>&1 &
 disown $!
diff --git a/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/start-ssh-jenkins.sh b/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/start-ssh-jenkins.sh
index d55c2c0..4934a8b 100755
--- a/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/start-ssh-jenkins.sh
+++ b/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/start-ssh-jenkins.sh
@@ -2,7 +2,8 @@
 
 cd ~/jenkins
 
-scp [email protected]:/srv/jenkins/war/WEB-INF/slave.jar .
+#scp [email protected]:/srv/jenkins/war/WEB-INF/slave.jar .
+curl -O https://jogamp.org/chuck/jnlpJars/agent.jar
 
 function connect_1 {
   sshpid=
@@ -29,8 +30,10 @@ function connect_2 {
 }
 
 
-connect_1 > win64-nvgtx460-win7-jogamp-x32-sgothel-010.log 2>&1 &
-disown $!
+#
+#connect_1 > win64-nvgtx460-win7-jogamp-x32-sgothel-010.log 2>&1 &
+#disown $!
+#
 
 connect_2 > win64-nvgtx460-win7-jogamp-x64-sgothel-011.log 2>&1 &
 disown $!
diff --git a/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/win64-nvgtx460-win7-jogamp-x32-sgothel-010.bat b/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/win64-nvgtx460-win7-jogamp-x32-sgothel-010.bat
index 83357f6..b295518 100755
--- a/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/win64-nvgtx460-win7-jogamp-x32-sgothel-010.bat
+++ b/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/win64-nvgtx460-win7-jogamp-x32-sgothel-010.bat
@@ -1,5 +1,5 @@
-set J2RE_HOME=c:\jre1.8.0_66_x32
-set JAVA_HOME=c:\jdk1.8.0_66_x32
+set J2RE_HOME=c:\jre1.8.0_121_x32
+set JAVA_HOME=c:\jdk1.8.0_121_x32
 set ANT_PATH=C:\apache-ant-1.9.4
 set GIT_PATH=C:\cygwin\bin
 set SEVENZIP=C:\Program Files\7-Zip
@@ -21,4 +21,4 @@ REM    -DuseKD=true
 REM    -Djogl.cg=1 -D-Dwindows.cg.lib=C:\Cg-2.2
 REM    -Dbuild.noarchives=true
 
-java -server -Xmx1024m -jar slave.jar -jnlpUrl https://jogamp.org/chuck/computer/win64-nvgtx460-win7-jogamp-x32-sgothel-010/slave-agent.jnlp
+java  -server -Xmx1024m -XX:+UseCompressedOops -jar agent.jar -jnlpUrl https://jogamp.org/chuck/computer/win64-nvgtx460-win7-jogamp-x32-sgothel-010/slave-agent.jnlp
diff --git a/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/win64-nvgtx460-win7-jogamp-x64-sgothel-011.bat b/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/win64-nvgtx460-win7-jogamp-x64-sgothel-011.bat
index 4b93a9e..2ba67f1 100755
--- a/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/win64-nvgtx460-win7-jogamp-x64-sgothel-011.bat
+++ b/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/win64-nvgtx460-win7-jogamp-x64-sgothel-011.bat
@@ -1,5 +1,5 @@
-set J2RE_HOME=c:\jre1.8.0_66_x64
-set JAVA_HOME=c:\jdk1.8.0_66_x64
+set J2RE_HOME=c:\jre1.8.0_121_x64
+set JAVA_HOME=c:\jdk1.8.0_121_x64
 set ANT_PATH=C:\apache-ant-1.9.4
 set GIT_PATH=C:\cygwin\bin
 set SEVENZIP=C:\Program Files\7-Zip
@@ -21,4 +21,4 @@ REM    -DuseKD=true
 REM    -Djogl.cg=1 -D-Dwindows.cg.lib=C:\Cg-2.2
 REM    -Dbuild.noarchives=true
 
-java -server -Xmx1024m -jar slave.jar -jnlpUrl https://jogamp.org/chuck/computer/win64-nvgtx460-win7-jogamp-x64-sgothel-011/slave-agent.jnlp
+java  -server -Xmx1024m -XX:+UseCompressedOops -jar agent.jar -jnlpUrl https://jogamp.org/chuck/computer/win64-nvgtx460-win7-jogamp-x64-sgothel-011/slave-agent.jnlp