Jenkins Nodes: Use Java8/ant-1.9.4 (win7-nvidia, win8-intelhd, linux-amd) ; Add new node 014/015 win8-intelhd

7 files changed, 105 insertions, 16 deletions

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 d2e56c3..5e235e6 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
@@ -8,8 +8,8 @@ scp [email protected]:/srv/jenkins/war/WEB-INF/slave.jar .
 
 function connect_1 {
   . /opt-share/etc/profile.ant
-  . /opt-linux-x86/etc/profile.jre7
-  . /opt-linux-x86/etc/profile.j2se7
+  . /opt-linux-x86/etc/profile.jre8
+  . /opt-linux-x86/etc/profile.j2se8
 
   export SOURCE_LEVEL=1.6
   export TARGET_LEVEL=1.6
@@ -31,8 +31,8 @@ function connect_1 {
 
 function connect_2 {
   . /opt-share/etc/profile.ant
-  . /opt-linux-x86_64/etc/profile.jre7
-  . /opt-linux-x86_64/etc/profile.j2se7
+  . /opt-linux-x86_64/etc/profile.jre8
+  . /opt-linux-x86_64/etc/profile.j2se8
 
   export SOURCE_LEVEL=1.6
   export TARGET_LEVEL=1.6
@@ -54,8 +54,8 @@ function connect_2 {
 
 function connect_30 {
   . /opt-share/etc/profile.ant
-  . /opt-linux-x86_64/etc/profile.jre7
-  . /opt-linux-x86_64/etc/profile.j2se7
+  . /opt-linux-x86_64/etc/profile.jre8
+  . /opt-linux-x86_64/etc/profile.j2se8
 
   export SOURCE_LEVEL=1.6
   export TARGET_LEVEL=1.6
@@ -102,8 +102,8 @@ function connect_30 {
 
 function connect_31 {
   . /opt-share/etc/profile.ant
-  . /opt-linux-x86_64/etc/profile.jre7
-  . /opt-linux-x86_64/etc/profile.j2se7
+  . /opt-linux-x86_64/etc/profile.jre8
+  . /opt-linux-x86_64/etc/profile.j2se8
 
   export SOURCE_LEVEL=1.6
   export TARGET_LEVEL=1.6
@@ -151,8 +151,8 @@ function connect_31 {
 
 function connect_40 {
   . /opt-share/etc/profile.ant
-  . /opt-linux-x86_64/etc/profile.jre7
-  . /opt-linux-x86_64/etc/profile.j2se7
+  . /opt-linux-x86_64/etc/profile.jre8
+  . /opt-linux-x86_64/etc/profile.j2se8
 
     export NODE_LABEL=label/android-armv7-img
     HOST_ROOT=/home/jogamp/JogAmpSlaveARMv7_Android
diff --git a/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/Cygwin-sshd-jenkins.bat b/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/Cygwin-sshd-jenkins.bat
new file mode 100755
index 0000000..dc406e2
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/Cygwin-sshd-jenkins.bat
@@ -0,0 +1,4 @@
+@echo off

+c:

+chdir c:\cygwin\bin

+bash --login -c "/usr/sbin/sshd ; /home/jogamp/jenkins/start-ssh-jenkins.sh"
diff --git a/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/start-ssh-jenkins.sh b/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/start-ssh-jenkins.sh
new file mode 100755
index 0000000..45b34ee
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/start-ssh-jenkins.sh
@@ -0,0 +1,37 @@
+#! /bin/sh
+
+cd ~/jenkins
+
+scp [email protected]:/srv/jenkins/war/WEB-INF/slave.jar .
+
+function connect_1 {
+  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 6014:localhost:5555 -N &
+    sshpid=$!
+    ./win64-intelhd-win8-jogamp-x32-sgothel-014.bat
+  done
+}
+
+function connect_2 {
+  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 6015:localhost:5555 -N &
+    sshpid=$!
+    ./win64-intelhd-win8-jogamp-x64-sgothel-015.bat
+  done
+}
+
+
+connect_1 > win64-intelhd-win8-jogamp-x32-sgothel-014.log 2>&1 &
+disown $!
+
+connect_2 > win64-intelhd-win8-jogamp-x64-sgothel-015.log 2>&1 &
+disown $!
+
diff --git a/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/win64-intelhd-win8-jogamp-x32-sgothel-014.bat b/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/win64-intelhd-win8-jogamp-x32-sgothel-014.bat
new file mode 100755
index 0000000..df33bb5
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/win64-intelhd-win8-jogamp-x32-sgothel-014.bat
@@ -0,0 +1,24 @@
+set J2RE_HOME=c:\jre1.8.0_20_x32
+set JAVA_HOME=c:\jdk1.8.0_20_x32
+set ANT_PATH=C:\apache-ant-1.9.4
+set GIT_PATH=C:\cygwin\bin
+set SEVENZIP=C:\Program Files\7-Zip
+
+set CMAKE_PATH=C:\cmake-2.8.10.2-win32-x86
+set CMAKE_C_COMPILER=c:\mingw\bin\gcc
+
+set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH%
+
+set SOURCE_LEVEL=1.6
+set TARGET_LEVEL=1.6
+set TARGET_RT_JAR=C:\jre1.6.0_30\lib\rt.jar
+
+set JOGAMP_JAR_CODEBASE=Codebase: *.jogamp.org
+
+REM    -Dc.compiler.debug=true 
+REM    -DuseOpenMAX=true 
+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-intelhd-win8-jogamp-x32-sgothel-014/slave-agent.jnlp
diff --git a/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/win64-intelhd-win8-jogamp-x64-sgothel-015.bat b/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/win64-intelhd-win8-jogamp-x64-sgothel-015.bat
new file mode 100755
index 0000000..dd6abb9
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/win64-intelhd-win8-jogamp-x64-sgothel-015.bat
@@ -0,0 +1,24 @@
+set J2RE_HOME=c:\jre1.8.0_20_x64
+set JAVA_HOME=c:\jdk1.8.0_20_x64
+set ANT_PATH=C:\apache-ant-1.9.4
+set GIT_PATH=C:\cygwin\bin
+set SEVENZIP=C:\Program Files\7-Zip
+
+set CMAKE_PATH=C:\cmake-2.8.10.2-win32-x86
+set CMAKE_C_COMPILER=c:\mingw64\bin\gcc
+
+set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH%
+
+set SOURCE_LEVEL=1.6
+set TARGET_LEVEL=1.6
+set TARGET_RT_JAR=C:\jre1.6.0_30\lib\rt.jar
+
+set JOGAMP_JAR_CODEBASE=Codebase: *.jogamp.org
+
+REM    -Dc.compiler.debug=true 
+REM    -DuseOpenMAX=true 
+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-intelhd-win8-jogamp-x64-sgothel-015/slave-agent.jnlp
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 2e1e938..c243b5a 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,6 +1,6 @@
-set J2RE_HOME=c:\jre1.7.0_45_x32
-set JAVA_HOME=c:\jdk1.7.0_45_x32
-set ANT_PATH=C:\apache-ant-1.8.2
+set J2RE_HOME=c:\jre1.8.0_20_x32
+set JAVA_HOME=c:\jdk1.8.0_20_x32
+set ANT_PATH=C:\apache-ant-1.9.4
 set GIT_PATH=C:\cygwin\bin
 set SEVENZIP=C:\Program Files\7-Zip
 
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 671a310..b111b52 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,6 +1,6 @@
-set J2RE_HOME=c:\jre1.7.0_45_x64
-set JAVA_HOME=c:\jdk1.7.0_45_x64
-set ANT_PATH=C:\apache-ant-1.8.2
+set J2RE_HOME=c:\jre1.8.0_20_x64
+set JAVA_HOME=c:\jdk1.8.0_20_x64
+set ANT_PATH=C:\apache-ant-1.9.4
 set GIT_PATH=C:\cygwin\bin
 set SEVENZIP=C:\Program Files\7-Zip