From ea8e82f8cb83a8732af7133d8ca0986af6717101 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sat, 8 Jun 2013 04:59:45 +0200 Subject: Updated jenkins start/init scripts. Align our debian init script w/ the one we used for redhat --- jenkins-server-slave-setup/scripts/start.jenkins.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'jenkins-server-slave-setup/scripts/start.jenkins.sh') diff --git a/jenkins-server-slave-setup/scripts/start.jenkins.sh b/jenkins-server-slave-setup/scripts/start.jenkins.sh index cd5187b..dae439f 100755 --- a/jenkins-server-slave-setup/scripts/start.jenkins.sh +++ b/jenkins-server-slave-setup/scripts/start.jenkins.sh @@ -3,5 +3,6 @@ export JENKINS_HOME=/srv/jenkins export JENKINS_WAR=$JENKINS_HOME/jenkins.war export JENKINS_LOG=$JENKINS_HOME/jenkins.log JAVA=$JAVA_HOME/bin/java -nohup nice $JAVA -jar $JENKINS_WAR --httpPort=8080 --prefix=/chuck > $JENKINS_LOG 2>&1 & +nohup nice $JAVA -server -Xmx1024m -jar $JENKINS_WAR --httpPort=8080 --prefix=/chuck > $JENKINS_LOG 2>&1 & +# nohup nice $JAVA -server -Xmx1024m -jar $JENKINS_WAR --httpPort=-1 --httpsPort=8080 --prefix=/chuck > $JENKINS_LOG 2>&1 & -- cgit v1.2.3 From a2a277cf4c081fc961a02df2305a7bb4ce8be971 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sat, 8 Jun 2013 05:18:10 +0200 Subject: Use dedicated jre6 for jenkins .. --- jenkins-server-slave-setup/scripts/start.jenkins.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'jenkins-server-slave-setup/scripts/start.jenkins.sh') diff --git a/jenkins-server-slave-setup/scripts/start.jenkins.sh b/jenkins-server-slave-setup/scripts/start.jenkins.sh index dae439f..71562ed 100755 --- a/jenkins-server-slave-setup/scripts/start.jenkins.sh +++ b/jenkins-server-slave-setup/scripts/start.jenkins.sh @@ -2,7 +2,11 @@ export JENKINS_HOME=/srv/jenkins export JENKINS_WAR=$JENKINS_HOME/jenkins.war export JENKINS_LOG=$JENKINS_HOME/jenkins.log + +#export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:bin/javac::") +export JAVA_HOME=/opt-linux-x86_64/jre6 JAVA=$JAVA_HOME/bin/java + nohup nice $JAVA -server -Xmx1024m -jar $JENKINS_WAR --httpPort=8080 --prefix=/chuck > $JENKINS_LOG 2>&1 & # nohup nice $JAVA -server -Xmx1024m -jar $JENKINS_WAR --httpPort=-1 --httpsPort=8080 --prefix=/chuck > $JENKINS_LOG 2>&1 & -- cgit v1.2.3 From 909a1bed99fa5f07fc3f4ec6564ffde529a5162b Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sun, 23 Jun 2013 12:24:06 +0200 Subject: Bug 758: Update all Jenkins Nodes to use Java7 building Java6 and new Security JAR tags. --- .../jenkins.desktop | 20 ++++++++ .../start-ssh-jenkins-linux.sh | 59 ++++++++++++++++++++++ .../c3d-win64-amd58xx-001-002/Cygwin-sshd.bat | 5 ++ .../c3d-win64-amd58xx-001-002/kill-all-ssh.sh | 3 ++ .../start-ssh-hudson-windows.sh | 36 +++++++++++++ .../win64-amd58xx-win7-jogamp-x32-c3d-001.bat | 21 ++++++++ .../win64-amd58xx-win7-jogamp-x64-c3d-002.bat | 21 ++++++++ .../start-ssh-jenkins-linux.sh | 48 +++++++++++++++--- .../start-ssh-jenkins.sh | 6 +++ .../start-ssh-jenkins-solaris-1.sh | 49 ------------------ .../start-ssh-jenkins-solaris.sh | 14 +++++ .../win64-nvgtx460-win7-jogamp-x32-sgothel-010.bat | 10 +++- .../win64-nvgtx460-win7-jogamp-x64-sgothel-011.bat | 10 +++- .../scripts/start.jenkins.sh | 2 +- jenkins-server-slave-setup/scripts/starthudson.sh | 4 +- 15 files changed, 244 insertions(+), 64 deletions(-) create mode 100755 jenkins-server-slave-setup/nodes/c3d-linux64-nvfx580-003_004.ubuntu10/jenkins.desktop create mode 100755 jenkins-server-slave-setup/nodes/c3d-linux64-nvfx580-003_004.ubuntu10/start-ssh-jenkins-linux.sh create mode 100755 jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/Cygwin-sshd.bat create mode 100644 jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/kill-all-ssh.sh create mode 100755 jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/start-ssh-hudson-windows.sh create mode 100755 jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/win64-amd58xx-win7-jogamp-x32-c3d-001.bat create mode 100755 jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/win64-amd58xx-win7-jogamp-x64-c3d-002.bat delete mode 100755 jenkins-server-slave-setup/nodes/sgothel-solaris10-nvquadro-020_021/start-ssh-jenkins-solaris-1.sh (limited to 'jenkins-server-slave-setup/scripts/start.jenkins.sh') diff --git a/jenkins-server-slave-setup/nodes/c3d-linux64-nvfx580-003_004.ubuntu10/jenkins.desktop b/jenkins-server-slave-setup/nodes/c3d-linux64-nvfx580-003_004.ubuntu10/jenkins.desktop new file mode 100755 index 0000000..fd5f558 --- /dev/null +++ b/jenkins-server-slave-setup/nodes/c3d-linux64-nvfx580-003_004.ubuntu10/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/c3d-linux64-nvfx580-003_004.ubuntu10/start-ssh-jenkins-linux.sh b/jenkins-server-slave-setup/nodes/c3d-linux64-nvfx580-003_004.ubuntu10/start-ssh-jenkins-linux.sh new file mode 100755 index 0000000..110eb28 --- /dev/null +++ b/jenkins-server-slave-setup/nodes/c3d-linux64-nvfx580-003_004.ubuntu10/start-ssh-jenkins-linux.sh @@ -0,0 +1,59 @@ +#! /bin/bash + +cd ~/jenkins + +scp chuckslave@jogamp.org:/srv/jenkins/war/WEB-INF/slave.jar . + +function connect_3 { + . /opt-share/etc/profile.ant + . /opt-linux-x86/etc/profile.jre7 + . /opt-linux-x86/etc/profile.j2se7 + + 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 5703:localhost:5555 -N & + sshpid=$! + java -server -Xmx1024m -jar slave.jar -jnlpUrl https://jogamp.org/chuck/computer/linux64-NVFX580-ubuntu10-jogamp-x32-c3d-003/slave-agent.jnlp + done +} + +function connect_4 { + . /opt-share/etc/profile.ant + . /opt-linux-x86_64/etc/profile.jre7 + . /opt-linux-x86_64/etc/profile.j2se7 + + 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 5704:localhost:5555 -N & + sshpid=$! + java -server -Xmx1024m -jar slave.jar -jnlpUrl https://jogamp.org/chuck/computer/linux64-NVFX580-ubuntu10-jogamp-x64-c3d-004/slave-agent.jnlp + done +} + + +connect_3 > linux64-NVFX580-ubuntu10-jogamp-x32-c3d-003.log 2>&1 & +disown $! + +connect_4 > linux64-NVFX580-ubuntu10-jogamp-x64-c3d-004.log 2>&1 & +disown $! + diff --git a/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/Cygwin-sshd.bat b/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/Cygwin-sshd.bat new file mode 100755 index 0000000..b6ddb51 --- /dev/null +++ b/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/Cygwin-sshd.bat @@ -0,0 +1,5 @@ +@echo off +c: +chdir c:\cygwin\bin +bash --login -c /usr/sbin/sshd +bash --login -c /usr/sbin/sshd diff --git a/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/kill-all-ssh.sh b/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/kill-all-ssh.sh new file mode 100644 index 0000000..93a10cf --- /dev/null +++ b/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/kill-all-ssh.sh @@ -0,0 +1,3 @@ +#! /bin/sh + +for i in `ps ax | grep ssh | awk ' { print $1 } ' ` ; do kill $i ; done diff --git a/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/start-ssh-hudson-windows.sh b/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/start-ssh-hudson-windows.sh new file mode 100755 index 0000000..a146299 --- /dev/null +++ b/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/start-ssh-hudson-windows.sh @@ -0,0 +1,36 @@ +#! /bin/sh + +cd ~/hudson + +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 5701:localhost:5555 -N & + sshpid=$! + ./win64-amd58xx-win7-jogamp-x32-c3d-001.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 5702:localhost:5555 -N & + sshpid=$! + ./win64-amd58xx-win7-jogamp-x64-c3d-002.bat + done +} + + +connect_1 > win64-amd58xx-win7-jogamp-x32-c3d-001.log 2>&1 & +disown $! + +connect_2 > win64-amd58xx-win7-jogamp-x64-c3d-002.log 2>&1 & +disown $! diff --git a/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/win64-amd58xx-win7-jogamp-x32-c3d-001.bat b/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/win64-amd58xx-win7-jogamp-x32-c3d-001.bat new file mode 100755 index 0000000..d1d0ac5 --- /dev/null +++ b/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/win64-amd58xx-win7-jogamp-x32-c3d-001.bat @@ -0,0 +1,21 @@ +set J2RE_HOME=c:\jre1.7.0_25_x32 +set JAVA_HOME=c:\jdk1.7.0_25_x32 +set ANT_PATH=C:\apache-ant-1.8.2 +set GIT_PATH=C:\cygwin\bin +set SEVENZIP=C:\Program Files\7-Zip + +set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\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-amd58xx-win7-jogamp-x32-c3d-001/slave-agent.jnlp diff --git a/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/win64-amd58xx-win7-jogamp-x64-c3d-002.bat b/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/win64-amd58xx-win7-jogamp-x64-c3d-002.bat new file mode 100755 index 0000000..8ce890b --- /dev/null +++ b/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/win64-amd58xx-win7-jogamp-x64-c3d-002.bat @@ -0,0 +1,21 @@ +set J2RE_HOME=c:\jre1.7.0_25_x64 +set JAVA_HOME=c:\jdk1.7.0_25_x64 +set ANT_PATH=C:\apache-ant-1.8.2 +set GIT_PATH=C:\cygwin\bin +set SEVENZIP=C:\Program Files\7-Zip + +set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\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-amd58xx-win7-jogamp-x64-c3d-002/slave-agent.jnlp 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 e765d2b..d2e56c3 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,15 @@ scp chuckslave@jogamp.org:/srv/jenkins/war/WEB-INF/slave.jar . function connect_1 { . /opt-share/etc/profile.ant - . /opt-linux-x86/etc/profile.jre6 - . /opt-linux-x86/etc/profile.j2se6 + . /opt-linux-x86/etc/profile.jre7 + . /opt-linux-x86/etc/profile.j2se7 + + 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 @@ -24,8 +31,15 @@ function connect_1 { function connect_2 { . /opt-share/etc/profile.ant - . /opt-linux-x86_64/etc/profile.jre6 - . /opt-linux-x86_64/etc/profile.j2se6 + . /opt-linux-x86_64/etc/profile.jre7 + . /opt-linux-x86_64/etc/profile.j2se7 + + 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 @@ -40,8 +54,14 @@ function connect_2 { function connect_30 { . /opt-share/etc/profile.ant - . /opt-linux-x86_64/etc/profile.jre6 - . /opt-linux-x86_64/etc/profile.j2se6 + . /opt-linux-x86_64/etc/profile.jre7 + . /opt-linux-x86_64/etc/profile.j2se7 + + 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" export NODE_LABEL=label/linux-armv7-img HOST_ROOT=/home/jogamp/JogAmpSlaveARMv7 @@ -82,8 +102,14 @@ function connect_30 { function connect_31 { . /opt-share/etc/profile.ant - . /opt-linux-x86_64/etc/profile.jre6 - . /opt-linux-x86_64/etc/profile.j2se6 + . /opt-linux-x86_64/etc/profile.jre7 + . /opt-linux-x86_64/etc/profile.j2se7 + + 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" export NODE_LABEL=label/linux-armv7hf-img HOST_ROOT=/home/jogamp/JogAmpSlaveARMv7hf @@ -124,6 +150,10 @@ 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 + export NODE_LABEL=label/android-armv7-img HOST_ROOT=/home/jogamp/JogAmpSlaveARMv7_Android JENKINS_WS=$HOST_ROOT/workspace @@ -153,6 +183,8 @@ function connect_40 { 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" + #export GCC_VERSION=4.4.3 export GCC_VERSION=4.7 HOST_ARCH=linux-x86 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 index a46ea6b..05c1880 100755 --- 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 @@ -14,6 +14,9 @@ function connect_12 { 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 which git sshpid= @@ -35,6 +38,9 @@ function connect_13 { 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 which git sshpid= diff --git a/jenkins-server-slave-setup/nodes/sgothel-solaris10-nvquadro-020_021/start-ssh-jenkins-solaris-1.sh b/jenkins-server-slave-setup/nodes/sgothel-solaris10-nvquadro-020_021/start-ssh-jenkins-solaris-1.sh deleted file mode 100755 index 2a5630a..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-solaris10-nvquadro-020_021/start-ssh-jenkins-solaris-1.sh +++ /dev/null @@ -1,49 +0,0 @@ -#! /bin/bash - -cd ~/jenkins - -rm -f slave.jar -# wget --no-check-certificate https://jogamp.org/chuck/jnlpJars/slave.jar -scp chuckslave@jogamp.org:/srv/jenkins/war/WEB-INF/slave.jar . - -function connect_1 { - # solaris-x86_32-nv - . /opt-share/etc/profile.ant - . /opt-solaris-x86/etc/profile.jre6 - . /opt-solaris-x86/etc/profile.j2se6 - java -d32 -version - which java - 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 6020:localhost:5555 -N & - sshpid=$! - java -d32 -server -jar slave.jar -jnlpUrl https://jogamp.org/chuck/computer/solaris-NVQUADRO-solaris10-jogamp-x32-sgothel-020/slave-agent.jnlp - done -} - -function connect_2 { - # solaris-x86_64-nv - . /opt-share/etc/profile.ant - . /opt-solaris-x86_64/etc/profile.jre6 - . /opt-solaris-x86_64/etc/profile.j2se6 - java -d64 -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 6021:localhost:5555 -N & - sshpid=$! - java -d64 -server -Xmx1024m -jar slave.jar -jnlpUrl https://jogamp.org/chuck/computer/solaris-NVQUADRO-solaris10-jogamp-x64-sgothel-021/slave-agent.jnlp - done -} - -connect_1 > solaris-NVQUADRO-solaris10-jogamp-x32-sgothel-020.log 2>&1 & -disown $! - -connect_2 > solaris-NVQUADRO-solaris10-jogamp-x64-sgothel-021.log 2>&1 & -disown $! - diff --git a/jenkins-server-slave-setup/nodes/sgothel-solaris10-nvquadro-020_021/start-ssh-jenkins-solaris.sh b/jenkins-server-slave-setup/nodes/sgothel-solaris10-nvquadro-020_021/start-ssh-jenkins-solaris.sh index 8d9425b..9f2d4ec 100755 --- a/jenkins-server-slave-setup/nodes/sgothel-solaris10-nvquadro-020_021/start-ssh-jenkins-solaris.sh +++ b/jenkins-server-slave-setup/nodes/sgothel-solaris10-nvquadro-020_021/start-ssh-jenkins-solaris.sh @@ -12,6 +12,13 @@ function connect_1 { export PATH=/usr/java/bin:$PATH #. /opt-solaris-x86/etc/profile.jre6 #. /opt-solaris-x86/etc/profile.j2se6 + + 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 -d32 -version which java sshpid= @@ -31,6 +38,13 @@ function connect_2 { export PATH=/usr/java/bin/amd64:$PATH #. /opt-solaris-x86_64/etc/profile.jre6 #. /opt-solaris-x86_64/etc/profile.j2se6 + + 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 -d64 -version sshpid= while true ; do 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 57f02d2..b8caa5b 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.6.0_35_x32 -set JAVA_HOME=c:\jdk1.6.0_35_x32 +set J2RE_HOME=c:\jre1.7.0_25_x32 +set JAVA_HOME=c:\jdk1.7.0_25_x32 set ANT_PATH=C:\apache-ant-1.8.2 set GIT_PATH=C:\cygwin\bin set SEVENZIP=C:\Program Files\7-Zip @@ -9,6 +9,12 @@ 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 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 bd95ebe..8947fba 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.6.0_35_x64 -set JAVA_HOME=c:\jdk1.6.0_35_x64 +set J2RE_HOME=c:\jre1.7.0_25_x64 +set JAVA_HOME=c:\jdk1.7.0_25_x64 set ANT_PATH=C:\apache-ant-1.8.2 set GIT_PATH=C:\cygwin\bin set SEVENZIP=C:\Program Files\7-Zip @@ -9,6 +9,12 @@ 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 diff --git a/jenkins-server-slave-setup/scripts/start.jenkins.sh b/jenkins-server-slave-setup/scripts/start.jenkins.sh index 71562ed..cacc638 100755 --- a/jenkins-server-slave-setup/scripts/start.jenkins.sh +++ b/jenkins-server-slave-setup/scripts/start.jenkins.sh @@ -4,7 +4,7 @@ export JENKINS_WAR=$JENKINS_HOME/jenkins.war export JENKINS_LOG=$JENKINS_HOME/jenkins.log #export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:bin/javac::") -export JAVA_HOME=/opt-linux-x86_64/jre6 +export JAVA_HOME=/opt-linux-x86_64/jre7 JAVA=$JAVA_HOME/bin/java nohup nice $JAVA -server -Xmx1024m -jar $JENKINS_WAR --httpPort=8080 --prefix=/chuck > $JENKINS_LOG 2>&1 & diff --git a/jenkins-server-slave-setup/scripts/starthudson.sh b/jenkins-server-slave-setup/scripts/starthudson.sh index 47fcac9..aea50f3 100755 --- a/jenkins-server-slave-setup/scripts/starthudson.sh +++ b/jenkins-server-slave-setup/scripts/starthudson.sh @@ -4,7 +4,7 @@ FLAGS="-server -Xms256m -Xmx512m -XX:MaxPermSize=128m -XX:+UseConcMarkSweepGC -X HUDSON_HOME=/srv/hudson/config export HUDSON_HOME -. /opt-linux-x86_64/etc/profile.jre6 +. /opt-linux-x86_64/etc/profile.jre7 . /opt-share/etc/profile.ant -/opt-linux-x86_64/jre6/bin/java ${FLAGS} -jar /srv/hudson/hudson.war 2>&1 | tee hudson.log +/opt-linux-x86_64/jre7/bin/java ${FLAGS} -jar /srv/hudson/hudson.war 2>&1 | tee hudson.log -- cgit v1.2.3