summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2020-01-04 19:30:45 +0100
committerSven Gothel <[email protected]>2020-01-04 19:30:45 +0100
commit2557ea117237fc4ee615aafbd895db720ceb58f2 (patch)
treeddd29d07807d9802a84ac7980a49dd0bd883b13e
parentf053eaf81821f58ad15c81ebc0311026aff8e216 (diff)
Re-add linux-x86_32 node
-rw-r--r--jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/profile.i386.j2se1116
-rwxr-xr-xjenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/start-ssh-jenkins-linux.sh6
-rwxr-xr-xjenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/win32-windows-jogamp-x32-sgothel-010.bat (renamed from jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/win64-nvgtx460-win7-jogamp-x32-sgothel-010.bat)0
3 files changed, 19 insertions, 3 deletions
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" [email protected] -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/win64-nvgtx460-win7-jogamp-x32-sgothel-010.bat b/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/win32-windows-jogamp-x32-sgothel-010.bat
index 0819de7..0819de7 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/win32-windows-jogamp-x32-sgothel-010.bat