Add linux-armhf in promotion, as well as adding a jenkins node

2 files changed, 48 insertions, 2 deletions

diff --git a/jenkins-builds/promote-latest-builds.sh b/jenkins-builds/promote-latest-builds.sh
index 01b52dd..3bcb74b 100755
--- a/jenkins-builds/promote-latest-builds.sh
+++ b/jenkins-builds/promote-latest-builds.sh
@@ -34,7 +34,7 @@ logfile=$thisdir/`basename $0 .sh`.log
 archivedir=/srv/www/jogamp.org/deployment/archive/$branch
 rootdir=/srv/www/jogamp.org/deployment/autobuilds/$branch
 
-os_and_archs_minus_one="linux-i586 linux-armv7 android-armv7 macosx-universal windows-amd64 windows-i586 solaris-i586 solaris-amd64"
+os_and_archs_minus_one="linux-i586 linux-armv7 linux-armv7hf android-armv7 macosx-universal windows-amd64 windows-i586 solaris-i586 solaris-amd64"
 masterpick="linux-amd64"
 os_and_archs="$masterpick $os_and_archs_minus_one"
 
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 c9011ca..ccd53aa 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
@@ -80,6 +80,49 @@ function connect_30 {
   done
 }
 
+function connect_31 {
+  . /opt-share/etc/profile.ant
+  . /opt-linux-x86_64/etc/profile.jre6
+  . /opt-linux-x86_64/etc/profile.j2se6
+
+    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/arm-linux-gnueabihf/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
+
+    export TARGET_PLATFORM_ROOT=/opt-linux-armv7-armhf
+    export TARGET_PLATFORM_LIBS=$TARGET_PLATFORM_ROOT/usr/lib
+    export TARGET_JAVA_LIBS=$TARGET_PLATFORM_ROOT/jre/lib/arm
+
+    export GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-linux-armv7hf.xml
+
+    export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
+
+  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 6031:localhost:5555 -N &
+    sshpid=$!
+    java -server -Xmx512m -jar slave.jar -jnlpUrl https://jogamp.org/chuck/computer/linuxARMv7hf-jogamp-arm32hf-sgothel-031/slave-agent.jnlp
+  done
+}
+
+
 function connect_40 {
     export NODE_LABEL=label/android-armv7-img
     HOST_ROOT=/home/jogamp/JogAmpSlaveARMv7_Android
@@ -88,7 +131,7 @@ function connect_40 {
     export HOST_UID=jogamp
     # jogamp02 - 10.1.0.122
     export HOST_IP=10.1.0.122
-    export HOST_RSYNC_ROOT=PROJECTS/JOGL
+    export HOST_RSYNC_ROOT=ROOTDIR/$JENKINS_WS
 
     export TARGET_UID=jogamp
     export TARGET_IP=panda02
@@ -147,6 +190,9 @@ disown $!
 connect_30 > linuxARMv7-jogamp-arm32-sgothel-030.log 2>&1 &
 disown $!
 
+connect_31 > linuxARMv7hf-jogamp-arm32hf-sgothel-031.log 2>&1 &
+disown $!
+
 connect_40 > androidARMv7-jogamp-arm32-sgothel-040.log 2>&1 &
 disown $!