From 2557ea117237fc4ee615aafbd895db720ceb58f2 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sat, 4 Jan 2020 19:30:45 +0100 Subject: Re-add linux-x86_32 node --- .../profile.i386.j2se11 | 16 +++++++++++++++ .../start-ssh-jenkins-linux.sh | 6 +++--- .../win32-windows-jogamp-x32-sgothel-010.bat | 24 ++++++++++++++++++++++ .../win64-nvgtx460-win7-jogamp-x32-sgothel-010.bat | 24 ---------------------- 4 files changed, 43 insertions(+), 27 deletions(-) create mode 100644 jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/profile.i386.j2se11 create mode 100755 jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/win32-windows-jogamp-x32-sgothel-010.bat delete mode 100755 jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/win64-nvgtx460-win7-jogamp-x32-sgothel-010.bat diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/profile.i386.j2se11 b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/profile.i386.j2se11 new file mode 100644 index 0000000..f8ecd21 --- /dev/null +++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/profile.i386.j2se11 @@ -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/jdk11 +export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-i386 + +export PATH=$JAVA_HOME/bin:$PATH diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/start-ssh-jenkins-linux.sh b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/start-ssh-jenkins-linux.sh index 9e8dd88..aef1dda 100755 --- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/start-ssh-jenkins-linux.sh +++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/start-ssh-jenkins-linux.sh @@ -30,7 +30,7 @@ function connect_1 { fi ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" chuckslave@jogamp.org -L 6001:localhost:5555 -N & sshpid=$! - java -server -Xmx512m -XX:+UseCompressedOops -jar agent.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/linux32-debian-jogamp-x32-sgothel-001/slave-agent.jnlp done } @@ -58,8 +58,8 @@ function connect_2 { done } -#connect_1 > linux64-AMD58xx-debian7-jogamp-x32-sgothel-001.log 2>&1 & -#disown $! +connect_1 > linux32-debian-jogamp-x32-sgothel-001.log 2>&1 & +disown $! connect_2 > linux64-AMD58xx-debian7-jogamp-x64-sgothel-002.log 2>&1 & disown $! diff --git a/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/win32-windows-jogamp-x32-sgothel-010.bat b/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/win32-windows-jogamp-x32-sgothel-010.bat new file mode 100755 index 0000000..0819de7 --- /dev/null +++ b/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/win32-windows-jogamp-x32-sgothel-010.bat @@ -0,0 +1,24 @@ +set J2RE_HOME=c:\jre-11.0.4+11_x32 +set JAVA_HOME=c:\jdk-11.0.4+11_x32 +set ANT_PATH=C:\apache-ant-1.10.5 +set GIT_PATH=C:\cygwin\bin +set SEVENZIP=C:\Program Files\7-Zip + +set CMAKE_PATH=C:\cmake-3.15.2-win32-x86 +set CMAKE_C_COMPILER=c:\mingw32\bin\gcc + +set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw32\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH% + +set SOURCE_LEVEL=1.8 +set TARGET_LEVEL=1.8 +set TARGET_RT_JAR=C:\jre1.8.0_212\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 -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-x32-sgothel-010.bat b/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/win64-nvgtx460-win7-jogamp-x32-sgothel-010.bat deleted file mode 100755 index 0819de7..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/win64-nvgtx460-win7-jogamp-x32-sgothel-010.bat +++ /dev/null @@ -1,24 +0,0 @@ -set J2RE_HOME=c:\jre-11.0.4+11_x32 -set JAVA_HOME=c:\jdk-11.0.4+11_x32 -set ANT_PATH=C:\apache-ant-1.10.5 -set GIT_PATH=C:\cygwin\bin -set SEVENZIP=C:\Program Files\7-Zip - -set CMAKE_PATH=C:\cmake-3.15.2-win32-x86 -set CMAKE_C_COMPILER=c:\mingw32\bin\gcc - -set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw32\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH% - -set SOURCE_LEVEL=1.8 -set TARGET_LEVEL=1.8 -set TARGET_RT_JAR=C:\jre1.8.0_212\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 -XX:+UseCompressedOops -jar agent.jar -jnlpUrl https://jogamp.org/chuck/computer/win64-nvgtx460-win7-jogamp-x32-sgothel-010/slave-agent.jnlp -- cgit v1.2.3