jenkins nodes: remove unused; split sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040

split sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040 on two machines
- sgothel-linuxARMv7l-030.androidARMv7l-040 (4 nodes crosscompiling w/o unit tests)
- sgothel-linux64-amd58xx-002 (1 node w/ actual unit tests)

51 files changed, 524 insertions, 372 deletions

diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/jenkins.desktop b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/jenkins.desktop
index fd5f558..fd5f558 100755
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/jenkins.desktop
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/jenkins.desktop
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/profile.amd64.j2se11 b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/profile.amd64.j2se11
index 1dccd22..1dccd22 100644
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/profile.amd64.j2se11
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/profile.amd64.j2se11
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/profile.amd64.j2se8 b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/profile.amd64.j2se8
index e5c2cd1..e5c2cd1 100644
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/profile.amd64.j2se8
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/profile.amd64.j2se8
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/profile.ant b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/profile.ant
index 85027cd..85027cd 100644
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/profile.ant
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/profile.ant
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/profile.i386.j2se8 b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/profile.i386.j2se8
index bd95e81..bd95e81 100644
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/profile.i386.j2se8
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/profile.i386.j2se8
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/setenv-android-tools.sh b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/setenv-android-tools.sh
index 477a66a..477a66a 100644
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/setenv-android-tools.sh
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/setenv-android-tools.sh
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
new file mode 100755
index 0000000..9e8dd88
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/start-ssh-jenkins-linux.sh
@@ -0,0 +1,66 @@
+#! /bin/bash
+
+# Bug 1386: Mesa 18.3.6 hardware renderer (Intel/AMD) freezes after native parenting
+export LIBGL_ALWAYS_SOFTWARE=true
+
+cd ~/jenkins
+
+JENKINS_NODE_STARTUP_DIR=`pwd`
+
+#scp [email protected]:/srv/jenkins/war/WEB-INF/slave.jar .
+curl -O https://jogamp.org/chuck/jnlpJars/agent.jar
+
+function connect_1 {
+  . ./profile.ant
+  . ./profile.i386.j2se11
+
+  export LIBGL_ALWAYS_SOFTWARE=true
+
+  export SOURCE_LEVEL=1.8
+  export TARGET_LEVEL=1.8
+  export TARGET_RT_JAR=/opt-share/jre1.8.0_212/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" [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
+  done
+}
+
+function connect_2 {
+  . ./profile.ant
+  . ./profile.amd64.j2se11
+
+  export LIBGL_ALWAYS_SOFTWARE=true
+
+  export SOURCE_LEVEL=1.8
+  export TARGET_LEVEL=1.8
+  export TARGET_RT_JAR=/opt-share/jre1.8.0_212/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" [email protected] -L 6002:localhost:5555 -N &
+    sshpid=$!
+    java -server -Xmx512m -XX:+UseCompressedOops -jar agent.jar -jnlpUrl https://jogamp.org/chuck/computer/linux64-AMD58xx-debian7-jogamp-x64-sgothel-002/slave-agent.jnlp 
+  done
+}
+
+#connect_1 > linux64-AMD58xx-debian7-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-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/c++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/c++
index c920aa1..c920aa1 120000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/c++
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/c++
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/cc b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/cc
index dbba1df..dbba1df 120000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/cc
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/cc
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/g++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/g++
index adeda86..adeda86 120000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/g++
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/g++
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/gcc b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/gcc
index 655df00..655df00 120000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/gcc
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/gcc
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/ld b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/ld
index 1931f6b..1931f6b 120000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/ld
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/ld
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/objdump b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/objdump
index 26f2062..26f2062 120000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/objdump
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/objdump
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/strip b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/strip
index 2ecfa61..2ecfa61 120000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/strip
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/strip
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/c++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/c++
index 1c36608..1c36608 120000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/c++
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/c++
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/cc b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/cc
index 5bd6938..5bd6938 120000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/cc
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/cc
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/g++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/g++
index 08ee1e8..08ee1e8 120000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/g++
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/g++
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/gcc b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/gcc
index 1bc2286..1bc2286 120000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/gcc
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/gcc
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/ld b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/ld
index 2b4985e..2b4985e 120000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/ld
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/ld
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/objdump b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/objdump
index dd058e0..dd058e0 120000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/objdump
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/objdump
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/strip b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/strip
index e366f85..e366f85 120000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/strip
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/strip
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
deleted file mode 100755
index 26bc9c5..0000000
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-nvidia-003_004/start-ssh-jenkins-linux.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /bin/bash
-
-cd ~/jenkins
-
-JENKINS_NODE_STARTUP_DIR=`pwd`
-
-scp [email protected]:/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" [email protected] -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" [email protected] -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-linux64-nvidia-003_004/jenkins.desktop b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/jenkins.desktop
index fd5f558..fd5f558 100755
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-nvidia-003_004/jenkins.desktop
+++ b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/jenkins.desktop
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/profile.amd64.j2se11 b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/profile.amd64.j2se11
new file mode 100644
index 0000000..1dccd22
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/profile.amd64.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-amd64
+
+export PATH=$JAVA_HOME/bin:$PATH
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/profile.amd64.j2se8 b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/profile.amd64.j2se8
new file mode 100644
index 0000000..e5c2cd1
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/profile.amd64.j2se8
@@ -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/j2se8
+export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
+
+export PATH=$JAVA_HOME/bin:$PATH
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/profile.ant b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/profile.ant
new file mode 100644
index 0000000..85027cd
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/profile.ant
@@ -0,0 +1,5 @@
+# /etc/profile.ant
+
+export ANT_PATH=/opt-share/apache-ant
+export ANT_HOME=$ANT_PATH
+export PATH=$ANT_PATH/bin:$PATH
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/profile.i386.j2se8 b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/profile.i386.j2se8
new file mode 100644
index 0000000..bd95e81
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/profile.i386.j2se8
@@ -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/j2se8
+export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-i386
+
+export PATH=$JAVA_HOME/bin:$PATH
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/setenv-android-tools.sh b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/setenv-android-tools.sh
new file mode 100644
index 0000000..477a66a
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/setenv-android-tools.sh
@@ -0,0 +1,373 @@
+#! /bin/sh
+
+# Aligned with Android SDK build-tools 29 and NDK 20 as of 2019-12-10
+#
+# As it is no more easily achievable to download the complete SDK 
+# separately, I used Android-Studio to fetch all parts incl. the NDK.
+# Thereafter I copied ~/Android/Sdk -> /opt-linux-x86_64/android-sdk-linux_x86_64
+# which I also use for the official crosscompilation.
+#
+# Variable names borrowed from ~/Android/Sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake
+# We only use ANDROID_API_LEVEL instead of ANDROID_PLATFORM_LEVEL, as it describes the API level.
+#
+#
+# User should set environment variables:
+# ==========================================
+#
+# - ANDROID_HOME - defaults to one of
+#        ~/Android/Sdk
+#        /opt-linux-x86_64/android-sdk-linux_x86_64
+#        /opt/android-sdk-linux_x86_64
+#        /usr/local/android-sdk-linux_x86_64
+#
+# - ANDROID_API_LEVEL - defaults to 24
+#
+# - ANDROID_HOST_TAG - defaults to linux-x86_64
+#
+# - ANDROID_ABI - defaults to x86_64, one of
+#        armeabi-v7a (with NEON by default since NDK r21)
+#        arm64-v8a 
+#        x86_64
+#        x86
+#
+# Following environment variables will be set
+# ============================================
+#
+# - ANDROID_SYSROOT_ABI
+# - ANDROID_TOOLCHAIN_NAME
+# - ANDROID_LLVM_TRIPLE
+# - ANDROID_BUILD_TOOLS_VERSION
+# - ANDROID_NDK
+# - ANDROID_BUILDTOOLS_ROOT
+# - ANDROID_TOOLCHAIN_ROOT
+# - ANDROID_TOOLCHAIN_SYSROOT0
+# - ANDROID_TOOLCHAIN_SYSROOT0_LIB
+# - ANDROID_TOOLCHAIN_SYSROOT1
+# - ANDROID_TOOLCHAIN_SYSROOT1_INC
+# - ANDROID_TOOLCHAIN_SYSROOT1_INC_ARCH
+# - ANDROID_TOOLCHAIN_SYSROOT1_INC_STL
+# - ANDROID_TOOLCHAIN_SYSROOT1_LIB1
+# - ANDROID_TOOLCHAIN_SYSROOT1_LIB2
+#
+# Android Studio SDK + NDK Filesystem Layout (official)
+#
+# ~/Android/Sdk/
+# ~/Android/Sdk/build-tools/29.0.2/
+# ~/Android/Sdk/build-tools/29.0.2/zipalign (*)
+# ~/Android/Sdk/ndk/
+# ~/Android/Sdk/ndk/20.1.5948944/platforms/android-24/arch-arm64 (1)
+# ~/Android/Sdk/ndk/20.1.5948944/platforms/android-24/arch-arm64/usr/lib/libc.a (*)(1)
+# ~/Android/Sdk/ndk/20.1.5948944/sysroot/ (gcc)
+# ~/Android/Sdk/ndk/20.1.5948944/sysroot/usr/include/ (gcc)
+# ~/Android/Sdk/ndk/20.1.5948944/sysroot/usr/lib/aarch64-linux-android/libc.a (gcc)
+# ~/Android/Sdk/ndk/20.1.5948944/toolchains/
+# ~/Android/Sdk/ndk/20.1.5948944/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/aarch64-linux-android/bin/ld (gcc)
+# ~/Android/Sdk/ndk/20.1.5948944/toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-ld (gcc)
+# ~/Android/Sdk/ndk/20.1.5948944/toolchains/llvm/
+# ~/Android/Sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ld (*)
+# ~/Android/Sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/linux-x86_64/aarch64-linux-android/bin/ld
+# ~/Android/Sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/linux-x86_64/bin/clang (*)
+# ~/Android/Sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/linux-x86_64/sysroot (2)
+# ~/Android/Sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include
+# ~/Android/Sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/aarch64-linux-android/asm/types.h (*) (2,3)
+# ~/Android/Sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/libc.a (*)
+# ~/Android/Sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/libc++_shared.so (*)
+# ~/Android/Sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/24/libc.a (*) (2)
+# ~/Android/Sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/c++/v1/complex (*) (4)
+#
+# (*) tested by this script
+#
+# (1) ANDROID_TOOLCHAIN_SYSROOT0 exposes all libs with standard FS layout usr/lib, but no include files
+#     -> ANDROID_TOOLCHAIN_SYSROOT0_LIB
+#
+# (2) ANDROID_TOOLCHAIN_SYSROOT1 exposes all libs but without standard FS layout, also exposes include files 
+#     -> ANDROID_TOOLCHAIN_SYSROOT1_INC
+#
+# (3) ANDROID_TOOLCHAIN_SYSROOT1 also exposes the arch dependent include files, i.e. asm/types.h etc
+#     -> ANDROID_TOOLCHAIN_SYSROOT1_INC_ARCH
+#
+# (4) ANDROID_TOOLCHAIN_SYSROOT1_INC_STL for LLVM's C++ STL lib (default since NDK r18)
+#     Using LLVM's c++_shared as of NDK r18: https://developer.android.com/ndk/guides/cpp-support.html
+#     LLVM's c++ headers must come before other system header!
+#     Also see https://github.com/android/ndk/issues/452 and https://gitlab.kitware.com/cmake/cmake/issues/17059
+#
+# Native libraries of (1) and (2) are identical
+#
+# Having
+#   ANDROID_HOME=~/Android/Sdk
+#   ANDROID_API_LEVEL 24
+#   ANDROID_HOST_TAG linux-x86_64
+#   ANDROID_ABI arm64-v8a
+# Using derived values of
+#   ANDROID_BUILD_TOOLS_VERSION=29.0.2
+#   ANDROID_NDK_VERSION=20.1.5948944
+#   ANDROID_TOOLCHAIN_NAME aarch64-linux-android
+#   ANDROID_TOOLCHAIN_PLATFORM_NAME=arm64
+#   ANDROID_SYSROOT_ABI=arm64
+
+echo $0
+
+NDK_TOOLCHAIN_VERSION=clang
+echo "Setting NDK_TOOLCHAIN_VERSION to ${NDK_TOOLCHAIN_VERSION} default!"
+
+if [ -z "${ANDROID_API_LEVEL}" ] ; then
+    ANDROID_API_LEVEL=24
+    echo "Setting undefined ANDROID_API_LEVEL to ${ANDROID_API_LEVEL} default!"
+fi
+if [ -z "${ANDROID_HOST_TAG}" ] ; then
+    ANDROID_HOST_TAG=linux-x86_64
+    echo "Setting undefined ANDROID_HOST_TAG to ${ANDROID_HOST_TAG} default!"
+fi
+
+if [ -z "${ANDROID_ABI}" ] ; then
+    ANDROID_ABI=x86_64
+    echo "Setting undefined ANDROID_ABI to ${ANDROID_ABI} default!"
+fi
+if [ "${ANDROID_ABI}" = "armeabi-v7a" ] ; then
+    # with NEON by default since NDK r21
+    ANDROID_SYSROOT_ABI=arm
+    #CMAKE_SYSTEM_PROCESSOR=armv7-a
+    ANDROID_TOOLCHAIN_NAME=arm-linux-androideabi
+    ANDROID_LLVM_TRIPLE=armv7-none-linux-androideabi
+elif [ "${ANDROID_ABI}" = "arm64-v8a" ] ; then
+    ANDROID_SYSROOT_ABI=arm64
+    #CMAKE_SYSTEM_PROCESSOR=aarch64
+    ANDROID_TOOLCHAIN_NAME=aarch64-linux-android
+    ANDROID_LLVM_TRIPLE=aarch64-none-linux-android
+elif [ "${ANDROID_ABI}" = "x86_64" ] ; then
+    ANDROID_SYSROOT_ABI=x86_64
+    #CMAKE_SYSTEM_PROCESSOR=x86_64
+    ANDROID_TOOLCHAIN_NAME=x86_64-linux-android
+    ANDROID_LLVM_TRIPLE=x86_64-none-linux-android
+elif [ "${ANDROID_ABI}" = "x86" ] ; then
+    ANDROID_SYSROOT_ABI=x86
+    #CMAKE_SYSTEM_PROCESSOR=i686
+    ANDROID_TOOLCHAIN_NAME=i686-linux-android
+    ANDROID_LLVM_TRIPLE=i686-none-linux-android
+else
+    echo "ANDROID_ABI is ${ANDROID_ABI} and not supported!"
+    exit 1
+fi
+
+echo "Preset-0 (user)"
+echo   ANDROID_HOME ${ANDROID_HOME}
+echo   ANDROID_API_LEVEL ${ANDROID_API_LEVEL}
+echo   ANDROID_HOST_TAG ${ANDROID_HOST_TAG}
+echo   ANDROID_ABI ${ANDROID_ABI}
+echo
+echo Preset-1
+echo   NDK_TOOLCHAIN_VERSION ${NDK_TOOLCHAIN_VERSION}
+echo   ANDROID_SYSROOT_ABI ${ANDROID_SYSROOT_ABI}
+echo   ANDROID_TOOLCHAIN_NAME ${ANDROID_TOOLCHAIN_NAME}
+echo   "ANDROID_LLVM_TRIPLE ${ANDROID_LLVM_TRIPLE} (compiler target)"
+echo   ANDROID_BUILD_TOOLS_VERSION ${ANDROID_BUILD_TOOLS_VERSION}
+echo   ANDROID_NDK ${ANDROID_NDK}
+echo
+echo Preset-2
+echo   ANDROID_BUILDTOOLS_ROOT ${ANDROID_BUILDTOOLS_ROOT}
+echo   ANDROID_TOOLCHAIN_ROOT ${ANDROID_TOOLCHAIN_ROOT}
+echo   ANDROID_TOOLCHAIN_SYSROOT0 ${ANDROID_TOOLCHAIN_SYSROOT0}
+echo   ANDROID_TOOLCHAIN_SYSROOT0_LIB ${ANDROID_TOOLCHAIN_SYSROOT0_LIB}
+echo   ANDROID_TOOLCHAIN_SYSROOT1 ${ANDROID_TOOLCHAIN_SYSROOT1}
+echo   ANDROID_TOOLCHAIN_SYSROOT1_INC ${ANDROID_TOOLCHAIN_SYSROOT1_INC}
+echo   ANDROID_TOOLCHAIN_SYSROOT1_INC_ARCH ${ANDROID_TOOLCHAIN_SYSROOT1_INC_ARCH}
+echo   ANDROID_TOOLCHAIN_SYSROOT1_INC_STL ${ANDROID_TOOLCHAIN_SYSROOT1_INC_STL}
+echo   ANDROID_TOOLCHAIN_SYSROOT1_LIB1 ${ANDROID_TOOLCHAIN_SYSROOT1_LIB1}
+echo   ANDROID_TOOLCHAIN_SYSROOT1_LIB2 ${ANDROID_TOOLCHAIN_SYSROOT1_LIB2}
+echo
+
+check_exists() {
+    if [ ! -e "$1" ] ; then
+        echo "$1" does not exist
+        exit 1
+    fi
+    return 0
+}
+
+if [ -z "${ANDROID_HOME}" ] ; then
+    if [ -e ${HOME}/Android/Sdk ] ; then
+        ANDROID_HOME=${HOME}/Android/Sdk
+    elif [ -e /opt-linux-x86_64/android-sdk-linux_x86_64 ] ; then
+        ANDROID_HOME=/opt-linux-x86_64/android-sdk-linux_x86_64
+    elif [ -e /opt/android-sdk-linux_x86_64 ] ; then
+        ANDROID_HOME=/opt/android-sdk-linux_x86_64
+    elif [ -e /usr/local/android-sdk-linux_x86_64 ] ; then
+        ANDROID_HOME=/usr/local/android-sdk-linux_x86_64
+    else 
+        echo ANDROID_HOME is not specified and does not exist in default locations
+        exit 1
+    fi
+elif [ ! -e ${ANDROID_HOME} ] ; then
+    echo ANDROID_HOME ${ANDROID_HOME} does not exist
+    exit 1
+fi
+
+unset ANDROID_BUILD_TOOLS_VERSION
+if [ -z "${ANDROID_BUILD_TOOLS_VERSION}" ] ; then
+    # basename $(dirname `find /home/sven/Android/Sdk/build-tools -name zipalign | sort -u | tail -n1`)
+    fzipalign=`find ${ANDROID_HOME}/build-tools -name zipalign | sort -u | tail -n1`
+    if [ ! -z "${fzipalign}" ] ; then
+        dzipalign=`dirname ${fzipalign}`
+        vzipalign=`basename ${dzipalign}`
+        if [ -e ${ANDROID_HOME}/build-tools/${vzipalign}/zipalign ] ; then
+            ANDROID_BUILD_TOOLS_VERSION=${vzipalign}
+        fi
+    fi
+    if [ -z "${ANDROID_BUILD_TOOLS_VERSION}" ] ; then
+        echo ANDROID_BUILD_TOOLS_VERSION ${ANDROID_HOME}/build-tools/ANDROID_BUILD_TOOLS_VERSION/zipalign does not exist
+        exit 1
+    fi
+fi
+
+if [ -z "${ANDROID_NDK}" ] ; then
+    #
+    # Generic android-ndk
+    #
+    if [ -e ${ANDROID_HOME}/ndk ] ; then
+        # basename $(dirname `find ndk -name toolchains -a -type d | sort -u | tail -n1`)
+        d2toolchains=`find ${ANDROID_HOME}/ndk -name toolchains -a -type d | sort -u | tail -n1`
+        if [ ! -z "${d2toolchains}" ] ; then
+            dtoolchains=`dirname ${d2toolchains}`
+            vtoolchains=`basename ${dtoolchains}`
+            # ~/Android/Sdk/ndk/20.1.5948944/sysroot/usr/lib/aarch64-linux-android/libc.a (*)
+            if [ -e ${ANDROID_HOME}/ndk/${vtoolchains}/sysroot/usr/lib/aarch64-linux-android/libc.a ] ; then
+                ANDROID_NDK_VERSION=${vtoolchains}
+            fi
+        fi
+        if [ -z "${ANDROID_NDK_VERSION}" ] ; then
+            echo ANDROID_NDK_VERSION ${ANDROID_HOME}/ndk/ANDROID_NDK_VERSION/sysroot/usr/lib/aarch64-linux-android/libc.a does not exist
+        else
+            ANDROID_NDK=${ANDROID_HOME}/ndk/${vtoolchains}
+        fi
+    fi
+    if [ -z "${ANDROID_NDK}" ] ; then
+        if [ -e /usr/local/android-ndk ] ; then
+            ANDROID_NDK=/usr/local/android-ndk
+        elif [ -e /opt-linux-x86_64/android-ndk ] ; then
+            ANDROID_NDK=/opt-linux-x86_64/android-ndk
+        elif [ -e /opt/android-ndk ] ; then
+            ANDROID_NDK=/opt/android-ndk
+        fi
+    fi
+    if [ -z "${ANDROID_NDK}" ] ; then
+        echo ANDROID_NDK is not specified and does not exist in default locations
+        exit 1
+    fi
+fi
+if [ ! -e "${ANDROID_NDK}" ] ; then
+    echo ANDROID_NDK ${ANDROID_NDK} does not exist
+    exit 1
+fi
+
+ANDROID_BUILDTOOLS_ROOT=${ANDROID_HOME}/build-tools/${ANDROID_BUILD_TOOLS_VERSION}
+ANDROID_TOOLCHAIN_ROOT=${ANDROID_NDK}/toolchains/llvm/prebuilt/${ANDROID_HOST_TAG}
+
+ANDROID_TOOLCHAIN_SYSROOT0=${ANDROID_NDK}/platforms/android-${ANDROID_API_LEVEL}/arch-${ANDROID_SYSROOT_ABI}
+ANDROID_TOOLCHAIN_SYSROOT0_LIB=${ANDROID_TOOLCHAIN_SYSROOT0}/usr/lib
+
+ANDROID_TOOLCHAIN_SYSROOT1=${ANDROID_TOOLCHAIN_ROOT}/sysroot
+ANDROID_TOOLCHAIN_SYSROOT1_INC=${ANDROID_TOOLCHAIN_SYSROOT1}/usr/include
+ANDROID_TOOLCHAIN_SYSROOT1_INC_ARCH=${ANDROID_TOOLCHAIN_SYSROOT1_INC}/${ANDROID_TOOLCHAIN_NAME}
+ANDROID_TOOLCHAIN_SYSROOT1_INC_STL=${ANDROID_TOOLCHAIN_SYSROOT1_INC}/c++/v1
+ANDROID_TOOLCHAIN_SYSROOT1_LIB1=${ANDROID_TOOLCHAIN_SYSROOT1}/usr/lib/${ANDROID_TOOLCHAIN_NAME}/${ANDROID_API_LEVEL}
+ANDROID_TOOLCHAIN_SYSROOT1_LIB2=${ANDROID_TOOLCHAIN_SYSROOT1}/usr/lib/${ANDROID_TOOLCHAIN_NAME}
+
+# ~/Android/Sdk/build-tools/29.0.2/zipalign (*)
+check_exists ${ANDROID_BUILDTOOLS_ROOT}/zipalign
+
+# ~/Android/Sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ld (*)
+check_exists ${ANDROID_TOOLCHAIN_ROOT}/bin/${ANDROID_TOOLCHAIN_NAME}-ld
+
+# ~/Android/Sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/linux-x86_64/bin/clang (*)
+check_exists ${ANDROID_TOOLCHAIN_ROOT}/bin/clang
+
+# ~/Android/Sdk/ndk/20.1.5948944/platforms/android-24/arch-arm64/usr/lib/libc.a (*)
+check_exists ${ANDROID_TOOLCHAIN_SYSROOT0_LIB}/libc.a
+
+# ~/Android/Sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/aarch64-linux-android/asm/types.h (*) (2)
+check_exists ${ANDROID_TOOLCHAIN_SYSROOT1_INC_ARCH}/asm/types.h
+
+# ~/Android/Sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/c++/v1/complex (*) (4)
+check_exists ${ANDROID_TOOLCHAIN_SYSROOT1_INC_STL}/complex
+
+# ~/Android/Sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/24/libc.a (*)
+check_exists ${ANDROID_TOOLCHAIN_SYSROOT1_LIB1}/libc.a
+
+# ~/Android/Sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/libc.a (*)
+# ~/Android/Sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/libc++_shared.so (*)
+check_exists ${ANDROID_TOOLCHAIN_SYSROOT1_LIB2}/libc.a
+check_exists ${ANDROID_TOOLCHAIN_SYSROOT1_LIB2}/libc++_shared.so
+
+export ANDROID_HOME
+export ANDROID_API_LEVEL
+export ANDROID_HOST_TAG
+export ANDROID_ABI
+
+export NDK_TOOLCHAIN_VERSION
+export ANDROID_SYSROOT_ABI
+export ANDROID_TOOLCHAIN_NAME
+export ANDROID_LLVM_TRIPLE
+export ANDROID_BUILD_TOOLS_VERSION
+export ANDROID_NDK
+
+export ANDROID_BUILDTOOLS_ROOT
+export ANDROID_TOOLCHAIN_ROOT
+export ANDROID_TOOLCHAIN_SYSROOT0
+export ANDROID_TOOLCHAIN_SYSROOT0_LIB
+export ANDROID_TOOLCHAIN_SYSROOT1
+export ANDROID_TOOLCHAIN_SYSROOT1_INC
+export ANDROID_TOOLCHAIN_SYSROOT1_INC_ARCH
+export ANDROID_TOOLCHAIN_SYSROOT1_INC_STL
+export ANDROID_TOOLCHAIN_SYSROOT1_LIB1
+export ANDROID_TOOLCHAIN_SYSROOT1_LIB2
+
+echo "Postset-0 (user)"
+echo   ANDROID_HOME ${ANDROID_HOME}
+echo   ANDROID_API_LEVEL ${ANDROID_API_LEVEL}
+echo   ANDROID_HOST_TAG ${ANDROID_HOST_TAG}
+echo   ANDROID_ABI ${ANDROID_ABI}
+echo
+echo Postset-1
+echo   NDK_TOOLCHAIN_VERSION ${NDK_TOOLCHAIN_VERSION}
+echo   ANDROID_SYSROOT_ABI ${ANDROID_SYSROOT_ABI}
+echo   ANDROID_TOOLCHAIN_NAME ${ANDROID_TOOLCHAIN_NAME}
+echo   "ANDROID_LLVM_TRIPLE ${ANDROID_LLVM_TRIPLE} (compiler target)"
+echo   ANDROID_BUILD_TOOLS_VERSION ${ANDROID_BUILD_TOOLS_VERSION}
+echo   ANDROID_NDK ${ANDROID_NDK}
+echo
+echo Postset-2
+echo   ANDROID_BUILDTOOLS_ROOT ${ANDROID_BUILDTOOLS_ROOT}
+echo   ANDROID_TOOLCHAIN_ROOT ${ANDROID_TOOLCHAIN_ROOT}
+echo   ANDROID_TOOLCHAIN_SYSROOT0 ${ANDROID_TOOLCHAIN_SYSROOT0}
+echo   ANDROID_TOOLCHAIN_SYSROOT0_LIB ${ANDROID_TOOLCHAIN_SYSROOT0_LIB}
+echo   ANDROID_TOOLCHAIN_SYSROOT1 ${ANDROID_TOOLCHAIN_SYSROOT1}
+echo   ANDROID_TOOLCHAIN_SYSROOT1_INC ${ANDROID_TOOLCHAIN_SYSROOT1_INC}
+echo   ANDROID_TOOLCHAIN_SYSROOT1_INC_ARCH ${ANDROID_TOOLCHAIN_SYSROOT1_INC_ARCH}
+echo   ANDROID_TOOLCHAIN_SYSROOT1_INC_STL ${ANDROID_TOOLCHAIN_SYSROOT1_INC_STL}
+echo   ANDROID_TOOLCHAIN_SYSROOT1_LIB1 ${ANDROID_TOOLCHAIN_SYSROOT1_LIB1}
+echo   ANDROID_TOOLCHAIN_SYSROOT1_LIB2 ${ANDROID_TOOLCHAIN_SYSROOT1_LIB2}
+echo
+
+export -p | grep ANDROID
+
+#
+# CC="$ANDROID_NDK/toolchains/llvm/prebuilt/$ANDROID_HOST_TAG/bin/clang -target $ANDROID_LLVM_TRIPLE"
+#
+## Generic flags.
+##list(APPEND ANDROID_COMPILER_FLAGS
+#  -g
+#  -DANDROID
+#  -fdata-sections
+#  -ffunction-sections
+#  -funwind-tables
+#  -fstack-protector-strong
+#  -no-canonical-prefixes)
+#list(APPEND ANDROID_LINKER_FLAGS
+#  -Wl,--build-id
+#  -Wl,--warn-shared-textrel
+#  -Wl,--fatal-warnings)
+#list(APPEND ANDROID_LINKER_FLAGS_EXE -Wl,--gc-sections)
+#
+#list(APPEND ANDROID_COMPILER_FLAGS_RELEASE -O2)
+#
+
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-linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh
index 118f41d..5521b4d 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-linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh
@@ -10,54 +10,6 @@ JENKINS_NODE_STARTUP_DIR=`pwd`
 #scp [email protected]:/srv/jenkins/war/WEB-INF/slave.jar .
 curl -O https://jogamp.org/chuck/jnlpJars/agent.jar
 
-function connect_1 {
-  . ./profile.ant
-  . ./profile.i386.j2se11
-
-  export LIBGL_ALWAYS_SOFTWARE=true
-
-  export SOURCE_LEVEL=1.8
-  export TARGET_LEVEL=1.8
-  export TARGET_RT_JAR=/opt-share/jre1.8.0_212/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" [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
-  done
-}
-
-function connect_2 {
-  . ./profile.ant
-  . ./profile.amd64.j2se11
-
-  export LIBGL_ALWAYS_SOFTWARE=true
-
-  export SOURCE_LEVEL=1.8
-  export TARGET_LEVEL=1.8
-  export TARGET_RT_JAR=/opt-share/jre1.8.0_212/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" [email protected] -L 6002:localhost:5555 -N &
-    sshpid=$!
-    java -server -Xmx512m -XX:+UseCompressedOops -jar agent.jar -jnlpUrl https://jogamp.org/chuck/computer/linux64-AMD58xx-debian7-jogamp-x64-sgothel-002/slave-agent.jnlp 
-  done
-}
-
 function connect_31 {
   . ./profile.ant
   . ./profile.amd64.j2se11
@@ -68,31 +20,18 @@ function connect_31 {
 
   export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
 
-    export NODE_LABEL=label/linux-armv7hf-img
-    HOST_ROOT=/home/jogamp/JogAmpSlaveARMv7hf
-    JENKINS_WS=$HOST_ROOT/workspace
-
-    # arm-linux-gnueabi == armel triplet
-    PATH=$JENKINS_NODE_STARTUP_DIR/toolchain/armhf-linux-gnueabi/bin:$PATH
-    export PATH
-
-    export HOST_UID=jogamp
-    export HOST_IP=jogamp02
-    export HOST_RSYNC_ROOT=ROOTDIR/$JENKINS_WS
+  # arm-linux-gnueabi == armel triplet
+  PATH=$JENKINS_NODE_STARTUP_DIR/toolchain/armhf-linux-gnueabi/bin:$PATH
+  export PATH
 
-    export TARGET_UID=jogamp
-    export TARGET_IP=panda01
-    export TARGET_ROOT=/home/jogamp/JogAmpSlaveARMv7hf
-    export TARGET_ANT_HOME=/usr/share/ant
+  export TARGET_PLATFORM_SYSROOT=`gcc --print-sysroot`
+  export TARGET_PLATFORM_USRROOT=/opt-linux-armv6-armhf
+  export TARGET_PLATFORM_USRLIBS=$TARGET_PLATFORM_USRROOT/usr/lib
+  export TARGET_JAVA_LIBS=$TARGET_PLATFORM_USRROOT/jre/lib/arm
 
-    export TARGET_PLATFORM_SYSROOT=`gcc --print-sysroot`
-    export TARGET_PLATFORM_USRROOT=/opt-linux-armv6-armhf
-    export TARGET_PLATFORM_USRLIBS=$TARGET_PLATFORM_USRROOT/usr/lib
-    export TARGET_JAVA_LIBS=$TARGET_PLATFORM_USRROOT/jre/lib/arm
+  export GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-linux-armv6hf.xml
 
-    export GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-linux-armv6hf.xml
-
-    export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
+  export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
 
   java -version
   sshpid=
@@ -116,31 +55,18 @@ function connect_32 {
 
   export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
 
-    export NODE_LABEL=label/linux-armv7hf-img
-    HOST_ROOT=/home/jogamp/JogAmpSlaveARM64
-    JENKINS_WS=$HOST_ROOT/workspace
-
-    # arm-linux-gnueabi == armel triplet
-    PATH=$JENKINS_NODE_STARTUP_DIR/toolchain/aarch64-linux-gnueabi/bin:$PATH
-    export PATH
-
-    export HOST_UID=jogamp
-    export HOST_IP=jogamp02
-    export HOST_RSYNC_ROOT=ROOTDIR/$JENKINS_WS
-
-    export TARGET_UID=jogamp
-    export TARGET_IP=panda01
-    export TARGET_ROOT=/home/jogamp/JogAmpSlaveARMv7hf
-    export TARGET_ANT_HOME=/usr/share/ant
+  # arm-linux-gnueabi == armel triplet
+  PATH=$JENKINS_NODE_STARTUP_DIR/toolchain/aarch64-linux-gnueabi/bin:$PATH
+  export PATH
 
-    export TARGET_PLATFORM_SYSROOT=`gcc --print-sysroot`
-    export TARGET_PLATFORM_USRROOT=/opt-linux-arm64
-    export TARGET_PLATFORM_USRLIBS=$TARGET_PLATFORM_USRROOT/usr/lib
-    export TARGET_JAVA_LIBS=$TARGET_PLATFORM_USRROOT/jre/lib/aarch64
+  export TARGET_PLATFORM_SYSROOT=`gcc --print-sysroot`
+  export TARGET_PLATFORM_USRROOT=/opt-linux-arm64
+  export TARGET_PLATFORM_USRLIBS=$TARGET_PLATFORM_USRROOT/usr/lib
+  export TARGET_JAVA_LIBS=$TARGET_PLATFORM_USRROOT/jre/lib/aarch64
 
-    export GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-linux-aarch64.xml
+  export GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-linux-aarch64.xml
 
-    export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
+  export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
 
   java -version
   sshpid=
@@ -178,24 +104,6 @@ function connect_40 {
     echo PATH ${PATH} 2>&1 | tee -a ${LOGF}
     echo clang `which clang` 2>&1 | tee -a ${LOGF}
 
-    export NODE_LABEL=label/android-armv7-img
-    HOST_ROOT=/home/jogamp/JogAmpSlaveARMv7_Android
-    JENKINS_WS=$HOST_ROOT/workspace
-
-    export HOST_UID=jogamp
-    # jogamp02 - 10.1.0.122
-    export HOST_IP=10.1.0.122
-    export HOST_RSYNC_ROOT=ROOTDIR/$JENKINS_WS
-
-    export TARGET_UID=jogamp
-    export TARGET_IP=panda02
-    #export TARGET_IP=jautab03
-    #export TARGET_IP=jauphone04
-    export TARGET_ADB_PORT=5555
-    # needs executable bit (probably su)
-    export TARGET_ROOT=/data/projects
-    export TARGET_ANT_HOME=/usr/share/ant
-
     export SOURCE_LEVEL=1.8
     export TARGET_LEVEL=1.8
     export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
@@ -242,24 +150,6 @@ function connect_41 {
     echo PATH ${PATH} 2>&1 | tee -a ${LOGF}
     echo clang `which clang` 2>&1 | tee -a ${LOGF}
 
-    export NODE_LABEL=label/android-aarch64
-    HOST_ROOT=/home/jogamp/JogAmpSlaveArm64_Android
-    JENKINS_WS=$HOST_ROOT/workspace
-
-    export HOST_UID=jogamp
-    # jogamp02 - 10.1.0.122
-    export HOST_IP=10.1.0.122
-    export HOST_RSYNC_ROOT=ROOTDIR/$JENKINS_WS
-
-    export TARGET_UID=jogamp
-    export TARGET_IP=panda02
-    #export TARGET_IP=jautab03
-    #export TARGET_IP=jauphone04
-    export TARGET_ADB_PORT=5555
-    # needs executable bit (probably su)
-    export TARGET_ROOT=/data/projects
-    export TARGET_ANT_HOME=/usr/share/ant
-
     export SOURCE_LEVEL=1.8
     export TARGET_LEVEL=1.8
     export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
@@ -281,12 +171,6 @@ function connect_41 {
   done
 }
 
-#connect_1 > linux64-AMD58xx-debian7-jogamp-x32-sgothel-001.log 2>&1 &
-#disown $!
-
-connect_2 > linux64-AMD58xx-debian7-jogamp-x64-sgothel-002.log 2>&1 &
-disown $!
-
 connect_31 > linuxARMv7hf-jogamp-arm32hf-sgothel-031.log 2>&1 &
 disown $!
 
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/c++ b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/c++
new file mode 120000
index 0000000..c920aa1
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/c++
@@ -0,0 +1 @@
+/usr/local/x-tools/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-c++
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/cc b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/cc
new file mode 120000
index 0000000..dbba1df
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/cc
@@ -0,0 +1 @@
+/usr/local/x-tools/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-cc
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/g++ b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/g++
new file mode 120000
index 0000000..adeda86
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/g++
@@ -0,0 +1 @@
+/usr/local/x-tools/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-g++
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/gcc b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/gcc
new file mode 120000
index 0000000..655df00
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/gcc
@@ -0,0 +1 @@
+/usr/local/x-tools/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-gcc
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/ld b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/ld
new file mode 120000
index 0000000..1931f6b
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/ld
@@ -0,0 +1 @@
+/usr/local/x-tools/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-ld.bfd
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/objdump b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/objdump
new file mode 120000
index 0000000..26f2062
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/objdump
@@ -0,0 +1 @@
+/usr/local/x-tools/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-objdump
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/strip b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/strip
new file mode 120000
index 0000000..2ecfa61
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/strip
@@ -0,0 +1 @@
+/usr/local/x-tools/aarch64-unknown-linux-gnu/bin/aarch64-unknown-linux-gnu-strip
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/c++ b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/c++
new file mode 120000
index 0000000..1c36608
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/c++
@@ -0,0 +1 @@
+/usr/local/x-tools/armv7-unknown-linux-gnueabihf/bin/armv7-unknown-linux-gnueabihf-c++
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/cc b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/cc
new file mode 120000
index 0000000..5bd6938
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/cc
@@ -0,0 +1 @@
+/usr/local/x-tools/armv7-unknown-linux-gnueabihf/bin/armv7-unknown-linux-gnueabihf-cc
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/g++ b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/g++
new file mode 120000
index 0000000..08ee1e8
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/g++
@@ -0,0 +1 @@
+/usr/local/x-tools/armv7-unknown-linux-gnueabihf/bin/armv7-unknown-linux-gnueabihf-g++
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/gcc b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/gcc
new file mode 120000
index 0000000..1bc2286
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/gcc
@@ -0,0 +1 @@
+/usr/local/x-tools/armv7-unknown-linux-gnueabihf/bin/armv7-unknown-linux-gnueabihf-gcc
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/ld b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/ld
new file mode 120000
index 0000000..2b4985e
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/ld
@@ -0,0 +1 @@
+/usr/local/x-tools/armv7-unknown-linux-gnueabihf/bin/armv7-unknown-linux-gnueabihf-ld.bfd
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/objdump b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/objdump
new file mode 120000
index 0000000..dd058e0
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/objdump
@@ -0,0 +1 @@
+/usr/local/x-tools/armv7-unknown-linux-gnueabihf/bin/armv7-unknown-linux-gnueabihf-objdump
\ No newline at end of file
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/strip b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/strip
new file mode 120000
index 0000000..e366f85
--- /dev/null
+++ b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/strip
@@ -0,0 +1 @@
+/usr/local/x-tools/armv7-unknown-linux-gnueabihf/bin/armv7-unknown-linux-gnueabihf-strip
\ No newline at end of file
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
deleted file mode 100755
index dc406e2..0000000
--- a/jenkins-server-slave-setup/nodes/sgothel-win64-amd-016_017/Cygwin-sshd-jenkins.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@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
deleted file mode 100755
index afc12a2..0000000
--- a/jenkins-server-slave-setup/nodes/sgothel-win64-amd-016_017/start-ssh-jenkins.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-
-cd ~/jenkins
-
-scp [email protected]:/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" [email protected] -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" [email protected] -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
deleted file mode 100755
index 843d06f..0000000
--- a/jenkins-server-slave-setup/nodes/sgothel-win64-amd-016_017/win64-amd-win7-jogamp-x32-sgothel-016.bat
+++ /dev/null
@@ -1,24 +0,0 @@
-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
-
-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
deleted file mode 100755
index fd5b5ad..0000000
--- a/jenkins-server-slave-setup/nodes/sgothel-win64-amd-016_017/win64-amd-win7-jogamp-x64-sgothel-017.bat
+++ /dev/null
@@ -1,24 +0,0 @@
-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
-
-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-intelhd-014_015/Cygwin-sshd-jenkins.bat b/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/Cygwin-sshd-jenkins.bat
deleted file mode 100755
index dc406e2..0000000
--- a/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/Cygwin-sshd-jenkins.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@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-intelhd-014_015/start-ssh-jenkins.sh b/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/start-ssh-jenkins.sh
deleted file mode 100755
index 45b34ee..0000000
--- a/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/start-ssh-jenkins.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-
-cd ~/jenkins
-
-scp [email protected]:/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" [email protected] -L 6014:localhost:5555 -N &
-    sshpid=$!
-    ./win64-intelhd-win8-jogamp-x32-sgothel-014.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" [email protected] -L 6015:localhost:5555 -N &
-    sshpid=$!
-    ./win64-intelhd-win8-jogamp-x64-sgothel-015.bat
-  done
-}
-
-
-connect_1 > win64-intelhd-win8-jogamp-x32-sgothel-014.log 2>&1 &
-disown $!
-
-connect_2 > win64-intelhd-win8-jogamp-x64-sgothel-015.log 2>&1 &
-disown $!
-
diff --git a/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/win64-intelhd-win8-jogamp-x32-sgothel-014.bat b/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/win64-intelhd-win8-jogamp-x32-sgothel-014.bat
deleted file mode 100755
index df33bb5..0000000
--- a/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/win64-intelhd-win8-jogamp-x32-sgothel-014.bat
+++ /dev/null
@@ -1,24 +0,0 @@
-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-intelhd-win8-jogamp-x32-sgothel-014/slave-agent.jnlp
diff --git a/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/win64-intelhd-win8-jogamp-x64-sgothel-015.bat b/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/win64-intelhd-win8-jogamp-x64-sgothel-015.bat
deleted file mode 100755
index dd6abb9..0000000
--- a/jenkins-server-slave-setup/nodes/sgothel-win64-intelhd-014_015/win64-intelhd-win8-jogamp-x64-sgothel-015.bat
+++ /dev/null
@@ -1,24 +0,0 @@
-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-intelhd-win8-jogamp-x64-sgothel-015/slave-agent.jnlp