From cbe332888e30f881787c50dab7092c5be99ecdce Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Mon, 16 Nov 2015 20:49:15 +0100 Subject: Add replacement nodes for linux64-nvidia and win64-amd sgothel-linux64-nvidia-003_004 sgothel-win64-amd-016_017 --- .../sgothel-linux64-nvidia-003_004/jenkins.desktop | 20 ++++++++ .../start-ssh-jenkins-linux.sh | 60 ++++++++++++++++++++++ .../Cygwin-sshd-jenkins.bat | 4 ++ .../sgothel-win64-amd-016_017/start-ssh-jenkins.sh | 37 +++++++++++++ .../win64-amd-win7-jogamp-x32-sgothel-016.bat | 24 +++++++++ .../win64-amd-win7-jogamp-x64-sgothel-017.bat | 24 +++++++++ .../win64-nvgtx460-win7-jogamp-x32-sgothel-010.bat | 4 +- .../win64-nvgtx460-win7-jogamp-x64-sgothel-011.bat | 4 +- 8 files changed, 173 insertions(+), 4 deletions(-) create mode 100755 jenkins-server-slave-setup/nodes/sgothel-linux64-nvidia-003_004/jenkins.desktop create mode 100755 jenkins-server-slave-setup/nodes/sgothel-linux64-nvidia-003_004/start-ssh-jenkins-linux.sh create mode 100755 jenkins-server-slave-setup/nodes/sgothel-win64-amd-016_017/Cygwin-sshd-jenkins.bat create mode 100755 jenkins-server-slave-setup/nodes/sgothel-win64-amd-016_017/start-ssh-jenkins.sh create mode 100755 jenkins-server-slave-setup/nodes/sgothel-win64-amd-016_017/win64-amd-win7-jogamp-x32-sgothel-016.bat create mode 100755 jenkins-server-slave-setup/nodes/sgothel-win64-amd-016_017/win64-amd-win7-jogamp-x64-sgothel-017.bat diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-nvidia-003_004/jenkins.desktop b/jenkins-server-slave-setup/nodes/sgothel-linux64-nvidia-003_004/jenkins.desktop new file mode 100755 index 0000000..fd5f558 --- /dev/null +++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-nvidia-003_004/jenkins.desktop @@ -0,0 +1,20 @@ +[Desktop Entry] +Comment[en_US]= +Comment= +Exec=/home/jogamp/jenkins/start-ssh-jenkins-linux.sh +GenericName[en_US]=jenkins KDE autostart +GenericName=jenkins KDE autostart +Icon=exec +MimeType= +Name[en_US]=jenkins +Name=jenkins +Path=/home/jogamp/jenkins +StartupNotify=false +Terminal=false +TerminalOptions= +Type=Application +X-DBUS-ServiceName= +X-DBUS-StartupType=none +X-KDE-SubstituteUID=false +X-KDE-Username= +X-Ubuntu-Gettext-Domain=desktop_kdebase diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-nvidia-003_004/start-ssh-jenkins-linux.sh b/jenkins-server-slave-setup/nodes/sgothel-linux64-nvidia-003_004/start-ssh-jenkins-linux.sh new file mode 100755 index 0000000..26bc9c5 --- /dev/null +++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-nvidia-003_004/start-ssh-jenkins-linux.sh @@ -0,0 +1,60 @@ +#! /bin/bash + +cd ~/jenkins + +JENKINS_NODE_STARTUP_DIR=`pwd` + +scp chuckslave@jogamp.org:/srv/jenkins/war/WEB-INF/slave.jar . + +function connect_1 { + . /opt-share/etc/profile.ant + . /opt-linux-x86/etc/profile.jre8 + . /opt-linux-x86/etc/profile.j2se8 + + export SOURCE_LEVEL=1.6 + export TARGET_LEVEL=1.6 + export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar + + export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" + + java -version + sshpid= + while true ; do + if [ ! -z "$sshpid" ] ; then + kill -9 $sshpid + fi + ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" chuckslave@jogamp.org -L 6003:localhost:5555 -N & + sshpid=$! + java -server -Xmx512m -jar slave.jar -jnlpUrl https://jogamp.org/chuck/computer/linux64-nvidia-debian7-jogamp-x32-sgothel-003/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 + + export SOURCE_LEVEL=1.6 + export TARGET_LEVEL=1.6 + export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar + + export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" + + java -version + sshpid= + while true ; do + if [ ! -z "$sshpid" ] ; then + kill -9 $sshpid + fi + ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" chuckslave@jogamp.org -L 6004:localhost:5555 -N & + sshpid=$! + java -server -Xmx512m -jar slave.jar -jnlpUrl https://jogamp.org/chuck/computer/linux64-nvidia-debian7-jogamp-x64-sgothel-004/slave-agent.jnlp + done +} + +connect_1 > linux64-nvidia-debian7-jogamp-x32-sgothel-003.log 2>&1 & +disown $! + +connect_2 > linux64-nvidia-debian7-jogamp-x64-sgothel-004.log 2>&1 & +disown $! + diff --git a/jenkins-server-slave-setup/nodes/sgothel-win64-amd-016_017/Cygwin-sshd-jenkins.bat b/jenkins-server-slave-setup/nodes/sgothel-win64-amd-016_017/Cygwin-sshd-jenkins.bat new file mode 100755 index 0000000..dc406e2 --- /dev/null +++ b/jenkins-server-slave-setup/nodes/sgothel-win64-amd-016_017/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-amd-016_017/start-ssh-jenkins.sh b/jenkins-server-slave-setup/nodes/sgothel-win64-amd-016_017/start-ssh-jenkins.sh new file mode 100755 index 0000000..afc12a2 --- /dev/null +++ b/jenkins-server-slave-setup/nodes/sgothel-win64-amd-016_017/start-ssh-jenkins.sh @@ -0,0 +1,37 @@ +#! /bin/sh + +cd ~/jenkins + +scp chuckslave@jogamp.org:/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" chuckslave@jogamp.org -L 6016:localhost:5555 -N & + sshpid=$! + ./win64-amd-win7-jogamp-x32-sgothel-016.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" chuckslave@jogamp.org -L 6017:localhost:5555 -N & + sshpid=$! + ./win64-amd-win7-jogamp-x64-sgothel-017.bat + done +} + + +connect_1 > win64-amd-win7-jogamp-x32-sgothel-016.log 2>&1 & +disown $! + +connect_2 > win64-amd-win7-jogamp-x64-sgothel-017.log 2>&1 & +disown $! + diff --git a/jenkins-server-slave-setup/nodes/sgothel-win64-amd-016_017/win64-amd-win7-jogamp-x32-sgothel-016.bat b/jenkins-server-slave-setup/nodes/sgothel-win64-amd-016_017/win64-amd-win7-jogamp-x32-sgothel-016.bat new file mode 100755 index 0000000..3a80cac --- /dev/null +++ b/jenkins-server-slave-setup/nodes/sgothel-win64-amd-016_017/win64-amd-win7-jogamp-x32-sgothel-016.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-amd-win7-jogamp-x32-sgothel-016/slave-agent.jnlp diff --git a/jenkins-server-slave-setup/nodes/sgothel-win64-amd-016_017/win64-amd-win7-jogamp-x64-sgothel-017.bat b/jenkins-server-slave-setup/nodes/sgothel-win64-amd-016_017/win64-amd-win7-jogamp-x64-sgothel-017.bat new file mode 100755 index 0000000..d12c619 --- /dev/null +++ b/jenkins-server-slave-setup/nodes/sgothel-win64-amd-016_017/win64-amd-win7-jogamp-x64-sgothel-017.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-amd-win7-jogamp-x64-sgothel-017/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 c243b5a..83357f6 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_20_x32 -set JAVA_HOME=c:\jdk1.8.0_20_x32 +set J2RE_HOME=c:\jre1.8.0_66_x32 +set JAVA_HOME=c:\jdk1.8.0_66_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 b111b52..4b93a9e 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_20_x64 -set JAVA_HOME=c:\jdk1.8.0_20_x64 +set J2RE_HOME=c:\jre1.8.0_66_x64 +set JAVA_HOME=c:\jdk1.8.0_66_x64 set ANT_PATH=C:\apache-ant-1.9.4 set GIT_PATH=C:\cygwin\bin set SEVENZIP=C:\Program Files\7-Zip -- cgit v1.2.3