diff options
| author | Sven Gothel <[email protected]> | 2023-01-23 01:23:50 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2023-01-23 01:23:50 +0100 |
| commit | 33536d1ae923149a0b7113d57cf8a96e42ab7d16 (patch) | |
| tree | 6bc83c9ed1da9e6b9abceafdec608c563a19d1de /jenkins-server-slave-setup | |
| parent | ee7083ecffa94be7f8753c41c6cad96d87e45d7a (diff) | |
Update jenkins-server-slave-setup, i.e. our Jenkins remote nodes (agents)
Diffstat (limited to 'jenkins-server-slave-setup')
77 files changed, 71 insertions, 1613 deletions
diff --git a/jenkins-server-slave-setup/nodes/c3d-linux64-nvfx580-003_004.ubuntu10/edid-sgothel-dfp0.bin b/jenkins-server-slave-setup/nodes/c3d-linux64-nvfx580-003_004.ubuntu10/edid-sgothel-dfp0.bin Binary files differdeleted file mode 100644 index 4e39474..0000000 --- a/jenkins-server-slave-setup/nodes/c3d-linux64-nvfx580-003_004.ubuntu10/edid-sgothel-dfp0.bin +++ /dev/null diff --git a/jenkins-server-slave-setup/nodes/c3d-linux64-nvfx580-003_004.ubuntu10/jenkins.desktop b/jenkins-server-slave-setup/nodes/c3d-linux64-nvfx580-003_004.ubuntu10/jenkins.desktop deleted file mode 100755 index fd5f558..0000000 --- a/jenkins-server-slave-setup/nodes/c3d-linux64-nvfx580-003_004.ubuntu10/jenkins.desktop +++ /dev/null @@ -1,20 +0,0 @@ -[Desktop Entry] -Comment[en_US]= -Comment= -Exec=/home/jogamp/jenkins/start-ssh-jenkins-linux.sh -GenericName[en_US]=jenkins KDE autostart -GenericName=jenkins KDE autostart -Icon=exec -MimeType= -Name[en_US]=jenkins -Name=jenkins -Path=/home/jogamp/jenkins -StartupNotify=false -Terminal=false -TerminalOptions= -Type=Application -X-DBUS-ServiceName= -X-DBUS-StartupType=none -X-KDE-SubstituteUID=false -X-KDE-Username= -X-Ubuntu-Gettext-Domain=desktop_kdebase diff --git a/jenkins-server-slave-setup/nodes/c3d-linux64-nvfx580-003_004.ubuntu10/start-ssh-jenkins-linux.sh b/jenkins-server-slave-setup/nodes/c3d-linux64-nvfx580-003_004.ubuntu10/start-ssh-jenkins-linux.sh deleted file mode 100755 index 6e01327..0000000 --- a/jenkins-server-slave-setup/nodes/c3d-linux64-nvfx580-003_004.ubuntu10/start-ssh-jenkins-linux.sh +++ /dev/null @@ -1,61 +0,0 @@ -#! /bin/bash - -cd ~/jenkins - -scp [email protected]:/srv/jenkins/war/WEB-INF/slave.jar . - -xrandr -s 1920x1080 - -function connect_3 { - . /opt-share/etc/profile.ant - . /opt-linux-x86/etc/profile.jre7 - . /opt-linux-x86/etc/profile.j2se7 - - 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 5703:localhost:5555 -N & - sshpid=$! - java -server -Xmx1024m -jar slave.jar -jnlpUrl https://jogamp.org/chuck/computer/linux64-NVFX580-ubuntu10-jogamp-x32-c3d-003/slave-agent.jnlp - done -} - -function connect_4 { - . /opt-share/etc/profile.ant - . /opt-linux-x86_64/etc/profile.jre7 - . /opt-linux-x86_64/etc/profile.j2se7 - - 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 5704:localhost:5555 -N & - sshpid=$! - java -server -Xmx1024m -jar slave.jar -jnlpUrl https://jogamp.org/chuck/computer/linux64-NVFX580-ubuntu10-jogamp-x64-c3d-004/slave-agent.jnlp - done -} - - -connect_3 > linux64-NVFX580-ubuntu10-jogamp-x32-c3d-003.log 2>&1 & -disown $! - -connect_4 > linux64-NVFX580-ubuntu10-jogamp-x64-c3d-004.log 2>&1 & -disown $! - diff --git a/jenkins-server-slave-setup/nodes/c3d-linux64-nvfx580-003_004.ubuntu10/xorg-linux-nv_gpu.conf b/jenkins-server-slave-setup/nodes/c3d-linux64-nvfx580-003_004.ubuntu10/xorg-linux-nv_gpu.conf deleted file mode 100644 index 0cdca62..0000000 --- a/jenkins-server-slave-setup/nodes/c3d-linux64-nvfx580-003_004.ubuntu10/xorg-linux-nv_gpu.conf +++ /dev/null @@ -1,57 +0,0 @@ -# nvidia-xconfig: X configuration file generated by nvidia-xconfig -# nvidia-xconfig: version 1.0 (buildmeister@builder58) Thu Apr 22 20:35:23 PDT 2010 - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" 0 0 - InputDevice "Keyboard0" "CoreKeyboard" - InputDevice "Mouse0" "CorePointer" -EndSection - -Section "InputDevice" - # generated from default - Identifier "Keyboard0" - Driver "keyboard" -EndSection - -Section "InputDevice" - # generated from default - Identifier "Mouse0" - Driver "mouse" - Option "Protocol" "auto" - Option "Device" "/dev/psaux" - Option "Emulate3Buttons" "no" - Option "ZAxisMapping" "4 5" -EndSection - -Section "Monitor" - Identifier "Configured Monitor" - VendorName "Unknown" - ModelName "Unknown" - HorizSync 30.0 - 140.0 - VertRefresh 56.0 - 120.0 - Option "DPMS" - DisplaySize 521 293 -EndSection - -Section "Device" - Identifier "Configured Video Device" - Driver "nvidia" - Option "CustomEDID" "DFP-0:/etc/X11/edid-sgothel-dfp0.bin" - Option "UseEdidDpi" "false" - Option "RandRRotation" "on" - Option "DynamicTwinView" "False" - Option "ConnectedMonitor" "DFP" -EndSection - -Section "Screen" - Identifier "Default Screen" - Device "Configured Video Device" - Monitor "Configured Monitor" - DefaultDepth 24 - SubSection "Display" - Depth 24 - Modes "1920x1080" "1680x1050" "1600x1200" "1440x900" "1280x1024" "1280x960" "1280x800" "1024x768" "800x600" "640x480" - EndSubSection -EndSection - diff --git a/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/Cygwin-sshd.bat b/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/Cygwin-sshd.bat deleted file mode 100755 index b6ddb51..0000000 --- a/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/Cygwin-sshd.bat +++ /dev/null @@ -1,5 +0,0 @@ -@echo off
-c:
-chdir c:\cygwin\bin
-bash --login -c /usr/sbin/sshd
-bash --login -c /usr/sbin/sshd
diff --git a/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/kill-all-ssh.sh b/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/kill-all-ssh.sh deleted file mode 100644 index 93a10cf..0000000 --- a/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/kill-all-ssh.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh - -for i in `ps ax | grep ssh | awk ' { print $1 } ' ` ; do kill $i ; done diff --git a/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/start-ssh-hudson-windows.sh b/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/start-ssh-hudson-windows.sh deleted file mode 100755 index a146299..0000000 --- a/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/start-ssh-hudson-windows.sh +++ /dev/null @@ -1,36 +0,0 @@ -#! /bin/sh - -cd ~/hudson - -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 5701:localhost:5555 -N & - sshpid=$! - ./win64-amd58xx-win7-jogamp-x32-c3d-001.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 5702:localhost:5555 -N & - sshpid=$! - ./win64-amd58xx-win7-jogamp-x64-c3d-002.bat - done -} - - -connect_1 > win64-amd58xx-win7-jogamp-x32-c3d-001.log 2>&1 & -disown $! - -connect_2 > win64-amd58xx-win7-jogamp-x64-c3d-002.log 2>&1 & -disown $! diff --git a/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/win64-amd58xx-win7-jogamp-x32-c3d-001.bat b/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/win64-amd58xx-win7-jogamp-x32-c3d-001.bat deleted file mode 100755 index 54cc8ed..0000000 --- a/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/win64-amd58xx-win7-jogamp-x32-c3d-001.bat +++ /dev/null @@ -1,21 +0,0 @@ -set J2RE_HOME=c:\jre1.7.0_45_x32 -set JAVA_HOME=c:\jdk1.7.0_45_x32 -set ANT_PATH=C:\apache-ant-1.8.2 -set GIT_PATH=C:\cygwin\bin -set SEVENZIP=C:\Program Files\7-Zip - -set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\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-amd58xx-win7-jogamp-x32-c3d-001/slave-agent.jnlp diff --git a/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/win64-amd58xx-win7-jogamp-x64-c3d-002.bat b/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/win64-amd58xx-win7-jogamp-x64-c3d-002.bat deleted file mode 100755 index 507e821..0000000 --- a/jenkins-server-slave-setup/nodes/c3d-win64-amd58xx-001-002/win64-amd58xx-win7-jogamp-x64-c3d-002.bat +++ /dev/null @@ -1,21 +0,0 @@ -set J2RE_HOME=c:\jre1.7.0_45_x64 -set JAVA_HOME=c:\jdk1.7.0_45_x64 -set ANT_PATH=C:\apache-ant-1.8.2 -set GIT_PATH=C:\cygwin\bin -set SEVENZIP=C:\Program Files\7-Zip - -set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\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-amd58xx-win7-jogamp-x64-c3d-002/slave-agent.jnlp diff --git a/jenkins-server-slave-setup/nodes/sgothel-solaris10-nvquadro-020_021/autologin.txt b/jenkins-server-slave-setup/nodes/retired/sgothel-solaris10-nvquadro-020_021/autologin.txt index 9558b8f..9558b8f 100644 --- a/jenkins-server-slave-setup/nodes/sgothel-solaris10-nvquadro-020_021/autologin.txt +++ b/jenkins-server-slave-setup/nodes/retired/sgothel-solaris10-nvquadro-020_021/autologin.txt diff --git a/jenkins-server-slave-setup/nodes/sgothel-solaris10-nvquadro-020_021/start-ssh-jenkins-solaris.sh b/jenkins-server-slave-setup/nodes/retired/sgothel-solaris10-nvquadro-020_021/start-ssh-jenkins-solaris.sh index 9f2d4ec..9f2d4ec 100755 --- a/jenkins-server-slave-setup/nodes/sgothel-solaris10-nvquadro-020_021/start-ssh-jenkins-solaris.sh +++ b/jenkins-server-slave-setup/nodes/retired/sgothel-solaris10-nvquadro-020_021/start-ssh-jenkins-solaris.sh diff --git a/jenkins-server-slave-setup/nodes/sgothel-solaris10-nvquadro-020_021/xorg-solaris-nv_gpu.conf b/jenkins-server-slave-setup/nodes/retired/sgothel-solaris10-nvquadro-020_021/xorg-solaris-nv_gpu.conf index cee87de..cee87de 100644 --- a/jenkins-server-slave-setup/nodes/sgothel-solaris10-nvquadro-020_021/xorg-solaris-nv_gpu.conf +++ b/jenkins-server-slave-setup/nodes/retired/sgothel-solaris10-nvquadro-020_021/xorg-solaris-nv_gpu.conf diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/jenkins.desktop b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/jenkins.desktop deleted file mode 100755 index fd5f558..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/jenkins.desktop +++ /dev/null @@ -1,20 +0,0 @@ -[Desktop Entry] -Comment[en_US]= -Comment= -Exec=/home/jogamp/jenkins/start-ssh-jenkins-linux.sh -GenericName[en_US]=jenkins KDE autostart -GenericName=jenkins KDE autostart -Icon=exec -MimeType= -Name[en_US]=jenkins -Name=jenkins -Path=/home/jogamp/jenkins -StartupNotify=false -Terminal=false -TerminalOptions= -Type=Application -X-DBUS-ServiceName= -X-DBUS-StartupType=none -X-KDE-SubstituteUID=false -X-KDE-Username= -X-Ubuntu-Gettext-Domain=desktop_kdebase diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/profile.amd64.j2se11 b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/profile.amd64.j2se11 deleted file mode 100644 index 1dccd22..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/profile.amd64.j2se11 +++ /dev/null @@ -1,16 +0,0 @@ -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-linux64-amd58xx-002/profile.amd64.j2se8 b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/profile.amd64.j2se8 deleted file mode 100644 index e5c2cd1..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/profile.amd64.j2se8 +++ /dev/null @@ -1,16 +0,0 @@ -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-linux64-amd58xx-002/profile.ant b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/profile.ant deleted file mode 100644 index 85027cd..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/profile.ant +++ /dev/null @@ -1,5 +0,0 @@ -# /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-linux64-amd58xx-002/profile.i386.j2se11 b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/profile.i386.j2se11 deleted file mode 100644 index f8ecd21..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/profile.i386.j2se11 +++ /dev/null @@ -1,16 +0,0 @@ -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/profile.i386.j2se8 b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/profile.i386.j2se8 deleted file mode 100644 index bd95e81..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/profile.i386.j2se8 +++ /dev/null @@ -1,16 +0,0 @@ -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-linux64-amd58xx-002/setenv-android-tools.sh b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/setenv-android-tools.sh deleted file mode 100644 index 477a66a..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/setenv-android-tools.sh +++ /dev/null @@ -1,373 +0,0 @@ -#! /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-002/start-ssh-jenkins-linux.sh b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/start-ssh-jenkins-linux.sh deleted file mode 100755 index b631beb..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/start-ssh-jenkins-linux.sh +++ /dev/null @@ -1,67 +0,0 @@ -#! /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/linux32-debian-jogamp-x32-sgothel-001/slave-agent.jnlp - java -server -Xmx512m -jar agent.jar -jnlpUrl https://jogamp.org/chuck/computer/linux32-debian-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 > 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-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/c++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/c++ deleted file mode 120000 index c920aa1..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/c++ +++ /dev/null @@ -1 +0,0 @@ -/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-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/cc b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/cc deleted file mode 120000 index dbba1df..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/cc +++ /dev/null @@ -1 +0,0 @@ -/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-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/g++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/g++ deleted file mode 120000 index adeda86..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/g++ +++ /dev/null @@ -1 +0,0 @@ -/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-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/gcc b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/gcc deleted file mode 120000 index 655df00..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/gcc +++ /dev/null @@ -1 +0,0 @@ -/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-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/ld b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/ld deleted file mode 120000 index 1931f6b..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/ld +++ /dev/null @@ -1 +0,0 @@ -/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-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/objdump b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/objdump deleted file mode 120000 index 26f2062..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/objdump +++ /dev/null @@ -1 +0,0 @@ -/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-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/strip b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/strip deleted file mode 120000 index 2ecfa61..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/aarch64-linux-gnueabi/bin/strip +++ /dev/null @@ -1 +0,0 @@ -/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-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/c++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/c++ deleted file mode 120000 index 1c36608..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/c++ +++ /dev/null @@ -1 +0,0 @@ -/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-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/cc b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/cc deleted file mode 120000 index 5bd6938..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/cc +++ /dev/null @@ -1 +0,0 @@ -/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-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/g++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/g++ deleted file mode 120000 index 08ee1e8..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/g++ +++ /dev/null @@ -1 +0,0 @@ -/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-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/gcc b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/gcc deleted file mode 120000 index 1bc2286..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/gcc +++ /dev/null @@ -1 +0,0 @@ -/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-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/ld b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/ld deleted file mode 120000 index 2b4985e..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/ld +++ /dev/null @@ -1 +0,0 @@ -/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-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/objdump b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/objdump deleted file mode 120000 index dd058e0..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/objdump +++ /dev/null @@ -1 +0,0 @@ -/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-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/strip b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/strip deleted file mode 120000 index e366f85..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-002/toolchain/armhf-linux-gnueabi/bin/strip +++ /dev/null @@ -1 +0,0 @@ -/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-linuxARMv7l-030.androidARMv7l-040/jenkins.desktop b/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/jenkins.desktop deleted file mode 100755 index fd5f558..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/jenkins.desktop +++ /dev/null @@ -1,20 +0,0 @@ -[Desktop Entry] -Comment[en_US]= -Comment= -Exec=/home/jogamp/jenkins/start-ssh-jenkins-linux.sh -GenericName[en_US]=jenkins KDE autostart -GenericName=jenkins KDE autostart -Icon=exec -MimeType= -Name[en_US]=jenkins -Name=jenkins -Path=/home/jogamp/jenkins -StartupNotify=false -Terminal=false -TerminalOptions= -Type=Application -X-DBUS-ServiceName= -X-DBUS-StartupType=none -X-KDE-SubstituteUID=false -X-KDE-Username= -X-Ubuntu-Gettext-Domain=desktop_kdebase 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 deleted file mode 100644 index 1dccd22..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/profile.amd64.j2se11 +++ /dev/null @@ -1,16 +0,0 @@ -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 deleted file mode 100644 index e5c2cd1..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/profile.amd64.j2se8 +++ /dev/null @@ -1,16 +0,0 @@ -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 deleted file mode 100644 index 85027cd..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/profile.ant +++ /dev/null @@ -1,5 +0,0 @@ -# /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 deleted file mode 100644 index bd95e81..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/profile.i386.j2se8 +++ /dev/null @@ -1,16 +0,0 @@ -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 deleted file mode 100644 index 477a66a..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/setenv-android-tools.sh +++ /dev/null @@ -1,373 +0,0 @@ -#! /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-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 deleted file mode 100755 index 2b31ee3..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh +++ /dev/null @@ -1,233 +0,0 @@ -#! /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_31 { - . ./profile.ant - . ./profile.amd64.j2se11 - - 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" - - # arm-linux-gnueabi == armel triplet - PATH=$JENKINS_NODE_STARTUP_DIR/toolchain/armhf-linux-gnueabi/bin:$PATH - export PATH - - 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 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 -XX:+UseCompressedOops -jar agent.jar -jnlpUrl https://jogamp.org/chuck/computer/linuxARMv7hf-jogamp-arm32hf-sgothel-031/slave-agent.jnlp - done -} - -function connect_32 { - . ./profile.ant - . ./profile.amd64.j2se11 - - 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" - - # 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 GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-linux-aarch64.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 6032:localhost:5555 -N & - sshpid=$! - java -server -Xmx512m -XX:+UseCompressedOops -jar agent.jar -jnlpUrl https://jogamp.org/chuck/computer/linuxARM64-jogamp-aarch64-sgothel-032/slave-agent.jnlp - done -} - -function connect_40 { - . ./profile.ant - . ./profile.amd64.j2se11 - - export ANDROID_HOME=/opt-linux-x86_64/android-sdk-linux_x86_64 - export ANDROID_API_LEVEL=24 - export ANDROID_HOST_TAG=linux-x86_64 - export ANDROID_ABI=armeabi-v7a - - if [ -e ${JENKINS_NODE_STARTUP_DIR}/setenv-android-tools.sh ] ; then - . ${JENKINS_NODE_STARTUP_DIR}/setenv-android-tools.sh - else - echo "${JENKINS_NODE_STARTUP_DIR}/setenv-android-tools.sh doesn't exist!" - exit 1 - fi - - export GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-android-armv6.xml - export GLUEGEN_PROPERTIES_FILE=/home/jogamp/android/gluegen.properties # for key signing props - - export PATH_VANILLA=$PATH - export PATH=${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_NAME}/bin:${ANDROID_TOOLCHAIN_ROOT}/bin:${ANDROID_HOME}/platform-tools:${ANDROID_BUILDTOOLS_ROOT}:${PATH} - echo PATH ${PATH} 2>&1 | tee -a ${LOGF} - echo clang `which clang` 2>&1 | tee -a ${LOGF} - - 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" - - #export JUNIT_DISABLED="true" - #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 6040:localhost:5555 -N & - sshpid=$! - java -server -Xmx512m -XX:+UseCompressedOops -jar agent.jar -jnlpUrl https://jogamp.org/chuck/computer/androidARMv7-jogamp-arm32-sgothel-040/slave-agent.jnlp - done - -} - -function connect_41 { - . ./profile.ant - . ./profile.amd64.j2se11 - - export ANDROID_HOME=/opt-linux-x86_64/android-sdk-linux_x86_64 - export ANDROID_API_LEVEL=24 - export ANDROID_HOST_TAG=linux-x86_64 - export ANDROID_ABI=arm64-v8a - - if [ -e ${JENKINS_NODE_STARTUP_DIR}/setenv-android-tools.sh ] ; then - . ${JENKINS_NODE_STARTUP_DIR}/setenv-android-tools.sh - else - echo "${JENKINS_NODE_STARTUP_DIR}/setenv-android-tools.sh doesn't exist!" - exit 1 - fi - - export GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-android-aarch64.xml - export GLUEGEN_PROPERTIES_FILE=/home/jogamp/android/gluegen.properties # for key signing props - - export PATH_VANILLA=$PATH - export PATH=${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_NAME}/bin:${ANDROID_TOOLCHAIN_ROOT}/bin:${ANDROID_HOME}/platform-tools:${ANDROID_BUILDTOOLS_ROOT}:${PATH} - echo PATH ${PATH} 2>&1 | tee -a ${LOGF} - echo clang `which clang` 2>&1 | tee -a ${LOGF} - - 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" - - #export JUNIT_DISABLED="true" - #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 6041:localhost:5555 -N & - sshpid=$! - java -server -Xmx512m -XX:+UseCompressedOops -jar agent.jar -jnlpUrl https://jogamp.org/chuck/computer/androidArm64-jogamp-aarch64-sgothel-041/slave-agent.jnlp - done -} - -function connect_42 { - . ./profile.ant - . ./profile.amd64.j2se11 - - export ANDROID_HOME=/opt-linux-x86_64/android-sdk-linux_x86_64 - export ANDROID_API_LEVEL=24 - export ANDROID_HOST_TAG=linux-x86_64 - export ANDROID_ABI=x86 - - if [ -e ${JENKINS_NODE_STARTUP_DIR}/setenv-android-tools.sh ] ; then - . ${JENKINS_NODE_STARTUP_DIR}/setenv-android-tools.sh - else - echo "${JENKINS_NODE_STARTUP_DIR}/setenv-android-tools.sh doesn't exist!" - exit 1 - fi - - export GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-android-x86.xml - export GLUEGEN_PROPERTIES_FILE=/home/jogamp/android/gluegen.properties # for key signing props - - export PATH_VANILLA=$PATH - export PATH=${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_NAME}/bin:${ANDROID_TOOLCHAIN_ROOT}/bin:${ANDROID_HOME}/platform-tools:${ANDROID_BUILDTOOLS_ROOT}:${PATH} - echo PATH ${PATH} 2>&1 | tee -a ${LOGF} - echo clang `which clang` 2>&1 | tee -a ${LOGF} - - 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" - - #export JUNIT_DISABLED="true" - #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 6042:localhost:5555 -N & - sshpid=$! - java -server -Xmx512m -XX:+UseCompressedOops -jar agent.jar -jnlpUrl https://jogamp.org/chuck/computer/androidX86-jogamp-i686-sgothel-042/slave-agent.jnlp - done -} - -connect_31 > linuxARMv7hf-jogamp-arm32hf-sgothel-031.log 2>&1 & -disown $! - -connect_32 > linuxARM64-jogamp-aarch64-sgothel-032.log 2>&1 & -disown $! - -connect_40 > androidARMv7-jogamp-arm32-sgothel-040.log 2>&1 & -disown $! - -connect_41 > androidArm64-jogamp-aarch64-sgothel-041.log 2>&1 & -disown $! - -connect_42 > androidX86-jogamp-i686-sgothel-042.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++ deleted file mode 120000 index c920aa1..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/c++ +++ /dev/null @@ -1 +0,0 @@ -/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 deleted file mode 120000 index dbba1df..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/cc +++ /dev/null @@ -1 +0,0 @@ -/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++ deleted file mode 120000 index adeda86..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/g++ +++ /dev/null @@ -1 +0,0 @@ -/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 deleted file mode 120000 index 655df00..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/gcc +++ /dev/null @@ -1 +0,0 @@ -/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 deleted file mode 120000 index 1931f6b..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/ld +++ /dev/null @@ -1 +0,0 @@ -/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 deleted file mode 120000 index 26f2062..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/objdump +++ /dev/null @@ -1 +0,0 @@ -/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 deleted file mode 120000 index 2ecfa61..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/aarch64-linux-gnueabi/bin/strip +++ /dev/null @@ -1 +0,0 @@ -/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++ deleted file mode 120000 index 1c36608..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/c++ +++ /dev/null @@ -1 +0,0 @@ -/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 deleted file mode 120000 index 5bd6938..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/cc +++ /dev/null @@ -1 +0,0 @@ -/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++ deleted file mode 120000 index 08ee1e8..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/g++ +++ /dev/null @@ -1 +0,0 @@ -/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 deleted file mode 120000 index 1bc2286..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/gcc +++ /dev/null @@ -1 +0,0 @@ -/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 deleted file mode 120000 index 2b4985e..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/ld +++ /dev/null @@ -1 +0,0 @@ -/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 deleted file mode 120000 index dd058e0..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/objdump +++ /dev/null @@ -1 +0,0 @@ -/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 deleted file mode 120000 index e366f85..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-linuxARMv7l-030.androidARMv7l-040/toolchain/armhf-linux-gnueabi/bin/strip +++ /dev/null @@ -1 +0,0 @@ -/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-macosx64-nv320m-012_013/README.macosx b/jenkins-server-slave-setup/nodes/sgothel-macos64-multi-012/README.macosx index fd61b9f..fd61b9f 100644 --- a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/README.macosx +++ b/jenkins-server-slave-setup/nodes/sgothel-macos64-multi-012/README.macosx diff --git a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/java.txt b/jenkins-server-slave-setup/nodes/sgothel-macos64-multi-012/java.txt index 1bb74fe..1bb74fe 100644 --- a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/java.txt +++ b/jenkins-server-slave-setup/nodes/sgothel-macos64-multi-012/java.txt diff --git a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/launch-old/macosx-startup-start-ssh-jenkins.command b/jenkins-server-slave-setup/nodes/sgothel-macos64-multi-012/launch-old/macosx-startup-start-ssh-jenkins.command index a33f7dc..a33f7dc 100755 --- a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/launch-old/macosx-startup-start-ssh-jenkins.command +++ b/jenkins-server-slave-setup/nodes/sgothel-macos64-multi-012/launch-old/macosx-startup-start-ssh-jenkins.command diff --git a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/launch-old/start-ssh-jenkins.sh b/jenkins-server-slave-setup/nodes/sgothel-macos64-multi-012/launch-old/start-ssh-jenkins.sh index 3434d8c..3434d8c 100755 --- a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/launch-old/start-ssh-jenkins.sh +++ b/jenkins-server-slave-setup/nodes/sgothel-macos64-multi-012/launch-old/start-ssh-jenkins.sh diff --git a/jenkins-server-slave-setup/nodes/sgothel-macos64-multi-012/launchd/com.jogamp.launched.load.sh b/jenkins-server-slave-setup/nodes/sgothel-macos64-multi-012/launchd/com.jogamp.launched.load.sh new file mode 100644 index 0000000..2e4b311 --- /dev/null +++ b/jenkins-server-slave-setup/nodes/sgothel-macos64-multi-012/launchd/com.jogamp.launched.load.sh @@ -0,0 +1,6 @@ +#! /bin/sh + +launchctl load -w ~/Library/LaunchAgents/com.jogamp.launched.start-ssh-jenkins-012.plist +#launchctl load -w ~/Library/LaunchAgents/com.jogamp.launched.start-ssh-jenkins-020.plist +#launchctl load -w ~/Library/LaunchAgents/com.jogamp.launched.start-ssh-jenkins-021.plist + diff --git a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/launchd/com.jogamp.launched.start-ssh-jenkins-012.plist b/jenkins-server-slave-setup/nodes/sgothel-macos64-multi-012/launchd/com.jogamp.launched.start-ssh-jenkins-012.plist index d79955a..650943c 100644 --- a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/launchd/com.jogamp.launched.start-ssh-jenkins-012.plist +++ b/jenkins-server-slave-setup/nodes/sgothel-macos64-multi-012/launchd/com.jogamp.launched.start-ssh-jenkins-012.plist @@ -28,9 +28,9 @@ <string>/Users/jogamp/jenkins/start-ssh-jenkins-012.sh</string> </array> <key>StandardOutPath</key> - <string>/Users/jogamp/jenkins/macosx64-NV320M-10_6-jogamp-x64-sgothel-012.stdout.log</string> + <string>/Users/jogamp/jenkins/macos-x86_64-jau-012.stdout.log</string> <key>StandardErrorPath</key> - <string>/Users/jogamp/jenkins/macosx64-NV320M-10_6-jogamp-x64-sgothel-012.stderr.log</string> + <string>/Users/jogamp/jenkins/macos-x86_64-jau-012.stderr.log</string> </dict> <!-- Manual Install: diff --git a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/launchd/com.jogamp.launched.start-ssh-jenkins-020.plist b/jenkins-server-slave-setup/nodes/sgothel-macos64-multi-012/launchd/com.jogamp.launched.start-ssh-jenkins-020.plist index 3e0a0cf..65d0cca 100644 --- a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/launchd/com.jogamp.launched.start-ssh-jenkins-020.plist +++ b/jenkins-server-slave-setup/nodes/sgothel-macos64-multi-012/launchd/com.jogamp.launched.start-ssh-jenkins-020.plist @@ -28,9 +28,9 @@ <string>/Users/jogamp/jenkins/start-ssh-jenkins-020.sh</string> </array> <key>StandardOutPath</key> - <string>/Users/jogamp/jenkins/iOSX64-jogamp-amd64-sgothel-020.stdout.log</string> + <string>/Users/jogamp/jenkins/ios-x86_64-amd64-jau-020.stdout.log</string> <key>StandardErrorPath</key> - <string>/Users/jogamp/jenkins/iOSX64-jogamp-amd64-sgothel-020.stderr.log</string> + <string>/Users/jogamp/jenkins/ios-x86_64-amd64-jau-020.stderr.log</string> </dict> <!-- Manual Install: diff --git a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/launchd/com.jogamp.launched.start-ssh-jenkins-021.plist b/jenkins-server-slave-setup/nodes/sgothel-macos64-multi-012/launchd/com.jogamp.launched.start-ssh-jenkins-021.plist index 32695c4..25e1e83 100644 --- a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/launchd/com.jogamp.launched.start-ssh-jenkins-021.plist +++ b/jenkins-server-slave-setup/nodes/sgothel-macos64-multi-012/launchd/com.jogamp.launched.start-ssh-jenkins-021.plist @@ -28,9 +28,9 @@ <string>/Users/jogamp/jenkins/start-ssh-jenkins-021.sh</string> </array> <key>StandardOutPath</key> - <string>/Users/jogamp/jenkins/iOSArm64-jogamp-aarch64-sgothel-021.stdout.log</string> + <string>/Users/jogamp/jenkins/ios-arm64-aarch64-jau-021.stdout.log</string> <key>StandardErrorPath</key> - <string>/Users/jogamp/jenkins/iOSArm64-jogamp-aarch64-sgothel-021.stderr.log</string> + <string>/Users/jogamp/jenkins/ios-arm64-aarch64-jau-021.stderr.log</string> </dict> <!-- Manual Install: diff --git a/jenkins-server-slave-setup/nodes/sgothel-macos64-multi-012/launchd/com.jogamp.launched.update.sh b/jenkins-server-slave-setup/nodes/sgothel-macos64-multi-012/launchd/com.jogamp.launched.update.sh new file mode 100644 index 0000000..ca752e6 --- /dev/null +++ b/jenkins-server-slave-setup/nodes/sgothel-macos64-multi-012/launchd/com.jogamp.launched.update.sh @@ -0,0 +1,17 @@ +#! /bin/sh + +mkdir -p ~/Library/LaunchAgents + +launchctl unload -w ~/Library/LaunchAgents/com.jogamp.launched.start-ssh-jenkins-012.plist +#launchctl unload -w ~/Library/LaunchAgents/com.jogamp.launched.start-ssh-jenkins-020.plist +#launchctl unload -w ~/Library/LaunchAgents/com.jogamp.launched.start-ssh-jenkins-021.plist + +sleep 5 +cp com.jogamp.launched.start-ssh-jenkins-012.plist ~/Library/LaunchAgents/ +#cp com.jogamp.launched.start-ssh-jenkins-020.plist ~/Library/LaunchAgents/ +#cp com.jogamp.launched.start-ssh-jenkins-021.plist ~/Library/LaunchAgents/ + +launchctl load -w ~/Library/LaunchAgents/com.jogamp.launched.start-ssh-jenkins-012.plist +#launchctl load -w ~/Library/LaunchAgents/com.jogamp.launched.start-ssh-jenkins-020.plist +#launchctl load -w ~/Library/LaunchAgents/com.jogamp.launched.start-ssh-jenkins-021.plist + diff --git a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/profile.ant b/jenkins-server-slave-setup/nodes/sgothel-macos64-multi-012/profile.ant index afa8511..afa8511 100755 --- a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/profile.ant +++ b/jenkins-server-slave-setup/nodes/sgothel-macos64-multi-012/profile.ant diff --git a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins-020.sh b/jenkins-server-slave-setup/nodes/sgothel-macos64-multi-012/retired/start-ssh-jenkins-020.sh index d513a2b..c6d44eb 100755 --- a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins-020.sh +++ b/jenkins-server-slave-setup/nodes/sgothel-macos64-multi-012/retired/start-ssh-jenkins-020.sh @@ -6,7 +6,7 @@ cd /Users/jogamp/jenkins curl -o agent-020.jar https://jogamp.org/chuck/jnlpJars/agent.jar . ./profile.ant -JAVA_HOME=`/usr/libexec/java_home -version 11` +JAVA_HOME=`/usr/libexec/java_home -version 17` PATH=$JAVA_HOME/bin:/usr/local/bin:$PATH export JAVA_HOME PATH export SOURCE_LEVEL=1.8 @@ -25,5 +25,5 @@ which git ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" [email protected] -L 6020:localhost:5555 -N & SSHPID=$! echo Launched SSH $SSHPID -java -server -Xmx1024m -XX:+UseCompressedOops -jar agent-020.jar -jnlpUrl https://jogamp.org/chuck/computer/iOSX64-jogamp-amd64-sgothel-020/slave-agent.jnlp +java -server -Xmx1024m -XX:+UseCompressedOops -jar agent-020.jar -jnlpUrl https://jogamp.org/chuck/computer/ios-x86_64-amd64-jau-020/slave-agent.jnlp diff --git a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins-021.sh b/jenkins-server-slave-setup/nodes/sgothel-macos64-multi-012/retired/start-ssh-jenkins-021.sh index af4c05a..2c8d348 100755 --- a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins-021.sh +++ b/jenkins-server-slave-setup/nodes/sgothel-macos64-multi-012/retired/start-ssh-jenkins-021.sh @@ -6,7 +6,7 @@ cd /Users/jogamp/jenkins curl -o agent-021.jar https://jogamp.org/chuck/jnlpJars/agent.jar . ./profile.ant -JAVA_HOME=`/usr/libexec/java_home -version 11` +JAVA_HOME=`/usr/libexec/java_home -version 17` PATH=$JAVA_HOME/bin:/usr/local/bin:$PATH export JAVA_HOME PATH export SOURCE_LEVEL=1.8 @@ -25,5 +25,5 @@ which git ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" [email protected] -L 6021:localhost:5555 -N & SSHPID=$! echo Launched SSH $SSHPID -java -server -Xmx1024m -XX:+UseCompressedOops -jar agent-021.jar -jnlpUrl https://jogamp.org/chuck/computer/iOSArm64-jogamp-aarch64-sgothel-021/slave-agent.jnlp +java -server -Xmx1024m -XX:+UseCompressedOops -jar agent-021.jar -jnlpUrl https://jogamp.org/chuck/computer/ios-arm64-aarch64-jau-021/slave-agent.jnlp diff --git a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins-012.sh b/jenkins-server-slave-setup/nodes/sgothel-macos64-multi-012/start-ssh-jenkins-012.sh index 15b621e..cd73f06 100755 --- a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins-012.sh +++ b/jenkins-server-slave-setup/nodes/sgothel-macos64-multi-012/start-ssh-jenkins-012.sh @@ -6,7 +6,7 @@ cd /Users/jogamp/jenkins curl -o agent-012.jar https://jogamp.org/chuck/jnlpJars/agent.jar . ./profile.ant -JAVA_HOME=`/usr/libexec/java_home -version 11` +JAVA_HOME=`/usr/libexec/java_home -version 17` PATH=$JAVA_HOME/bin:/usr/local/bin:$PATH export JAVA_HOME PATH export SOURCE_LEVEL=1.8 @@ -15,7 +15,7 @@ export TARGET_RT_JAR=/usr/local/jre1.8.0_212/lib/rt.jar export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" -export SDKROOT=macosx10.11 +export SDKROOT=macosx11.3 xcrun --show-sdk-path java -version @@ -23,5 +23,5 @@ which git ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" [email protected] -L 6012:localhost:5555 -N & SSHPID=$! echo Launched SSH $SSHPID -java -server -Xmx1024m -XX:+UseCompressedOops -jar agent-012.jar -jnlpUrl https://jogamp.org/chuck/computer/macosx64-NV320M-10_6-jogamp-x64-sgothel-012/slave-agent.jnlp +java -server -Xmx1024m -XX:+UseCompressedOops -jar agent-012.jar -jnlpUrl https://jogamp.org/chuck/computer/macos-x86_64-jau-012/slave-agent.jnlp diff --git a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/launchd/com.jogamp.launched.load.sh b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/launchd/com.jogamp.launched.load.sh deleted file mode 100644 index ed29d05..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/launchd/com.jogamp.launched.load.sh +++ /dev/null @@ -1,7 +0,0 @@ -#! /bin/sh - -launchctl load -w ~/Library/LaunchAgents/com.jogamp.launched.start-ssh-jenkins-012.plist -#launchctl load -w ~/Library/LaunchAgents/com.jogamp.launched.start-ssh-jenkins-013.plist -launchctl load -w ~/Library/LaunchAgents/com.jogamp.launched.start-ssh-jenkins-020.plist -launchctl load -w ~/Library/LaunchAgents/com.jogamp.launched.start-ssh-jenkins-021.plist - diff --git a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/launchd/com.jogamp.launched.start-ssh-jenkins-013.plist b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/launchd/com.jogamp.launched.start-ssh-jenkins-013.plist deleted file mode 100644 index 9007394..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/launchd/com.jogamp.launched.start-ssh-jenkins-013.plist +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<!-- - Created w/ help of: - - http://launched.zerowidth.com/ ---> -<dict> - <key>Label</key> - <string>com.jogamp.launched.start-ssh-jenkins-013</string> - <key>UserName</key> - <string>jogamp</string> - <key>GroupName</key> - <string>staff</string> - <key>WorkingDirectory</key> - <string>/Users/jogamp/jenkins</string> - <key>ProcessType</key> - <string>Interactive</string> - <key>LaunchOnlyOnce</key> - <false/> - <key>KeepAlive</key> - <true/> - <key>AbandonProcessGroup</key> - <false/> - <key>ProgramArguments</key> - <array> - <string>/bin/sh</string> - <string>/Users/jogamp/jenkins/start-ssh-jenkins-013.sh</string> - </array> - <key>StandardOutPath</key> - <string>/Users/jogamp/jenkins/macosx64-NV320M-10_6-jogamp-x64-sgothel-013.stdout.log</string> - <key>StandardErrorPath</key> - <string>/Users/jogamp/jenkins/macosx64-NV320M-10_6-jogamp-x64-sgothel-013.stderr.log</string> -</dict> -<!-- -Manual Install: - -mkdir -p ~/Library/LaunchAgents -cp com.jogamp.launched.start-ssh-jenkins-013.plist ~/Library/LaunchAgents/ -launchctl load -w ~/Library/LaunchAgents/com.jogamp.launched.start-ssh-jenkins-013.plist ---> -</plist> - diff --git a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/launchd/com.jogamp.launched.update.sh b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/launchd/com.jogamp.launched.update.sh deleted file mode 100644 index f869f92..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/launchd/com.jogamp.launched.update.sh +++ /dev/null @@ -1,13 +0,0 @@ -#! /bin/sh - -mkdir -p ~/Library/LaunchAgents -cp com.jogamp.launched.start-ssh-jenkins-012.plist ~/Library/LaunchAgents/ -#cp com.jogamp.launched.start-ssh-jenkins-013.plist ~/Library/LaunchAgents/ -cp com.jogamp.launched.start-ssh-jenkins-020.plist ~/Library/LaunchAgents/ -cp com.jogamp.launched.start-ssh-jenkins-021.plist ~/Library/LaunchAgents/ - -#launchctl load -w ~/Library/LaunchAgents/com.jogamp.launched.start-ssh-jenkins-012.plist -#launchctl load -w ~/Library/LaunchAgents/com.jogamp.launched.start-ssh-jenkins-013.plist -#launchctl load -w ~/Library/LaunchAgents/com.jogamp.launched.start-ssh-jenkins-020.plist -#launchctl load -w ~/Library/LaunchAgents/com.jogamp.launched.start-ssh-jenkins-021.plist - diff --git a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins-013.sh b/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins-013.sh deleted file mode 100755 index dd84f4e..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-macosx64-nv320m-012_013/start-ssh-jenkins-013.sh +++ /dev/null @@ -1,28 +0,0 @@ -#! /bin/sh - -cd /Users/jogamp/jenkins - -#scp [email protected]:/srv/jenkins/war/WEB-INF/slave.jar slave-013.jar -curl -o agent-013.jar https://jogamp.org/chuck/jnlpJars/agent.jar - -. ./profile.ant -JAVA_HOME=`/usr/libexec/java_home -version 11` -PATH=$JAVA_HOME/bin:/usr/local/bin:$PATH -export JAVA_HOME PATH -export SOURCE_LEVEL=1.8 -export TARGET_LEVEL=1.8 -export TARGET_RT_JAR=/usr/local/jre1.8.0_212/lib/rt.jar - -export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" - -export SDKROOT=macosx10.11 -xcrun --show-sdk-path - -java -version -which git -ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" [email protected] -L 6013:localhost:5555 -N & -SSHPID=$! -echo Launched SSH $SSHPID -java -server -Xmx1024m -XX:+UseCompressedOops -jar agent-013.jar -jnlpUrl https://jogamp.org/chuck/computer/macosx64-NV320M-10_7-jogamp-x64-jre8-sgothel-013/slave-agent.jnlp - - diff --git a/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/Cygwin-sshd-jenkins.bat b/jenkins-server-slave-setup/nodes/sgothel-win64-multi-010/Cygwin-sshd-jenkins.bat index dc406e2..dc406e2 100755 --- a/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/Cygwin-sshd-jenkins.bat +++ b/jenkins-server-slave-setup/nodes/sgothel-win64-multi-010/Cygwin-sshd-jenkins.bat diff --git a/jenkins-server-slave-setup/nodes/sgothel-win64-multi-010/start-ssh-jenkins.sh b/jenkins-server-slave-setup/nodes/sgothel-win64-multi-010/start-ssh-jenkins.sh new file mode 100755 index 0000000..ad6a3a4 --- /dev/null +++ b/jenkins-server-slave-setup/nodes/sgothel-win64-multi-010/start-ssh-jenkins.sh @@ -0,0 +1,26 @@ +#! /bin/sh + +cd ~/jenkins + +#scp [email protected]:/srv/jenkins/war/WEB-INF/slave.jar . +curl -O https://jogamp.org/chuck/jnlpJars/agent.jar + +function connect_2 { + sshpid= + while true ; do + if [ ! -z "$sshpid" ] ; then + kill -9 $sshpid + fi + if [ -e stop_node ] ; then + exit 1 + fi + ssh -o "ServerAliveInterval 30" -o "ServerAliveCountMax 5" -o "TCPKeepAlive yes" [email protected] -L 6011:localhost:5555 -N & + sshpid=$! + ./windows-x86_64-jau-011.bat + done +} + + +connect_2 > windows-x86_64-jau-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-multi-010/windows-x86_32-jau-010.bat index acf70ce..64ad832 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-multi-010/windows-x86_32-jau-010.bat @@ -1,11 +1,11 @@ -set J2RE_HOME=c:\jre-11.0.4+11_x32 -set JAVA_HOME=c:\jdk-11.0.4+11_x32 +set J2RE_HOME=c:\jdk-17 +set JAVA_HOME=c:\jdk-17 set ANT_PATH=C:\apache-ant-1.10.5 set GIT_PATH=C:\cygwin64\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 CMAKE_PATH=C:\cmake-3.25.1-windows-x64_64 +set CMAKE_C_COMPILER=c:\mingw64\bin\gcc set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw32\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH% @@ -22,4 +22,4 @@ REM -Djogl.cg=1 -D-Dwindows.cg.lib=C:\Cg-2.2 REM -Dbuild.noarchives=true 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 +java -server -Xmx1024m -jar agent.jar -jnlpUrl https://jogamp.org/chuck/computer/windows-x86_32-jau-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-multi-010/windows-x86_64-jau-011.bat index 9f0ec40..5e43d1f 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-multi-010/windows-x86_64-jau-011.bat @@ -1,10 +1,10 @@ -set J2RE_HOME=c:\jre-11.0.4+11_x64 -set JAVA_HOME=c:\jdk-11.0.4+11_x64 +set J2RE_HOME=c:\jdk-17 +set JAVA_HOME=c:\jdk-17 set ANT_PATH=C:\apache-ant-1.10.5 set GIT_PATH=C:\cygwin64\bin set SEVENZIP=C:\Program Files\7-Zip -set CMAKE_PATH=C:\cmake-3.15.2-win64-x64 +set CMAKE_PATH=C:\cmake-3.25.1-windows-x64_64 set CMAKE_C_COMPILER=c:\mingw64\bin\gcc set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH% @@ -21,4 +21,4 @@ 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-x64-sgothel-011/slave-agent.jnlp +java -server -Xmx1024m -XX:+UseCompressedOops -jar agent.jar -jnlpUrl https://jogamp.org/chuck/computer/windows-x86_64-jau-011/slave-agent.jnlp 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 deleted file mode 100755 index 33d95c8..0000000 --- a/jenkins-server-slave-setup/nodes/sgothel-win64-nvgtx460-010_011/start-ssh-jenkins.sh +++ /dev/null @@ -1,40 +0,0 @@ -#! /bin/sh - -cd ~/jenkins - -#scp [email protected]:/srv/jenkins/war/WEB-INF/slave.jar . -curl -O https://jogamp.org/chuck/jnlpJars/agent.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 6010:localhost:5555 -N & - sshpid=$! - ./win32-windows-jogamp-x32-sgothel-010.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 6011:localhost:5555 -N & - sshpid=$! - ./win64-nvgtx460-win7-jogamp-x64-sgothel-011.bat - done -} - - - -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 $! - |