summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2020-01-04 19:31:57 +0100
committerSven Gothel <[email protected]>2020-01-04 19:31:57 +0100
commit9e7d8d055206819275aa79cc8a48b83083a46eca (patch)
treeecc0c8863ddbf5143f05e5ba0d15ea8ac95654c0
parent2557ea117237fc4ee615aafbd895db720ceb58f2 (diff)
Re-add windows-x86_32 node
-rwxr-xr-xjenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/start-ssh-jenkins.sh10
-rwxr-xr-xjenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/win32-windows-jogamp-x32-sgothel-010.bat5
-rwxr-xr-xjenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/win64-nvgtx460-win7-jogamp-x64-sgothel-011.bat2
3 files changed, 9 insertions, 8 deletions
diff --git a/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/start-ssh-jenkins.sh b/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/start-ssh-jenkins.sh
index 4934a8b..33d95c8 100755
--- a/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/start-ssh-jenkins.sh
+++ b/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/start-ssh-jenkins.sh
@@ -13,7 +13,7 @@ function connect_1 {
fi
ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" [email protected] -L 6010:localhost:5555 -N &
sshpid=$!
- ./win64-nvgtx460-win7-jogamp-x32-sgothel-010.bat
+ ./win32-windows-jogamp-x32-sgothel-010.bat
done
}
@@ -30,10 +30,10 @@ function connect_2 {
}
-#
-#connect_1 > win64-nvgtx460-win7-jogamp-x32-sgothel-010.log 2>&1 &
-#disown $!
-#
+
+connect_1 > win32-windows-jogamp-x32-sgothel-010.log 2>&1 &
+disown $!
+
connect_2 > win64-nvgtx460-win7-jogamp-x64-sgothel-011.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
index 0819de7..acf70ce 100755
--- 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
@@ -1,7 +1,7 @@
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 GIT_PATH=C:\cygwin64\bin
set SEVENZIP=C:\Program Files\7-Zip
set CMAKE_PATH=C:\cmake-3.15.2-win32-x86
@@ -21,4 +21,5 @@ 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
+REM java -server -Xmx1024m -XX:+UseCompressedOops -jar agent.jar -jnlpUrl https://jogamp.org/chuck/computer/win32-windows-jogamp-x32-sgothel-010/slave-agent.jnlp
+java -server -Xmx1024m -jar agent.jar -jnlpUrl https://jogamp.org/chuck/computer/win32-windows-jogamp-x32-sgothel-010/slave-agent.jnlp
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 fc22d7a..9f0ec40 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,7 +1,7 @@
set J2RE_HOME=c:\jre-11.0.4+11_x64
set JAVA_HOME=c:\jdk-11.0.4+11_x64
set ANT_PATH=C:\apache-ant-1.10.5
-set GIT_PATH=C:\cygwin\bin
+set GIT_PATH=C:\cygwin64\bin
set SEVENZIP=C:\Program Files\7-Zip
set CMAKE_PATH=C:\cmake-3.15.2-win64-x64