summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/profile.amd64.j2se11 (renamed from jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/profile.amd64.j2se8)4
-rwxr-xr-xjenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh62
-rwxr-xr-xjenkins-server-slave-setup/scripts/start.jenkins.sh5
-rw-r--r--server/setup/05-service-settings/etc/apache2/mods-available/fcgid.conf9
-rw-r--r--server/setup/05-service-settings/etc/apache2/sites-available/jogamp_org-ssl.conf2
-rw-r--r--server/setup/05-service-settings/etc/apache2/sites-available/jogamp_org.conf2
6 files changed, 48 insertions, 36 deletions
diff --git a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/profile.amd64.j2se8 b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/profile.amd64.j2se11
index e5c2cd1..1dccd22 100644
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/profile.amd64.j2se8
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/profile.amd64.j2se11
@@ -10,7 +10,7 @@ unset TYA_LOGFILE
export CLASSPATH=.
-#export JAVA_HOME=/opt-linux-x86_64/j2se8
-export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
+#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-001_002.linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh
index f9f7e69..8ccaa8b 100755
--- a/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh
+++ b/jenkins-server-slave-setup/nodes/sgothel-linux64-amd58xx-001_002.linuxARMv7l-030.androidARMv7l-040/start-ssh-jenkins-linux.sh
@@ -9,11 +9,11 @@ curl -O https://jogamp.org/chuck/jnlpJars/agent.jar
function connect_1 {
. ./profile.ant
- . ./profile.i386.j2se8
+ . ./profile.i386.j2se11
- export SOURCE_LEVEL=1.6
- export TARGET_LEVEL=1.6
- export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+ 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"
@@ -31,11 +31,11 @@ function connect_1 {
function connect_2 {
. ./profile.ant
- . ./profile.amd64.j2se8
+ . ./profile.amd64.j2se11
- export SOURCE_LEVEL=1.6
- export TARGET_LEVEL=1.6
- export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+ 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"
@@ -53,11 +53,11 @@ function connect_2 {
function connect_31 {
. ./profile.ant
- . ./profile.amd64.j2se8
+ . ./profile.amd64.j2se11
- export SOURCE_LEVEL=1.6
- export TARGET_LEVEL=1.6
- export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+ 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"
@@ -101,11 +101,11 @@ function connect_31 {
function connect_32 {
. ./profile.ant
- . ./profile.amd64.j2se8
+ . ./profile.amd64.j2se11
- export SOURCE_LEVEL=1.6
- export TARGET_LEVEL=1.6
- export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+ 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"
@@ -149,7 +149,7 @@ function connect_32 {
function connect_40 {
. ./profile.ant
- . ./profile.amd64.j2se8
+ . ./profile.amd64.j2se11
export NODE_LABEL=label/android-armv7-img
HOST_ROOT=/home/jogamp/JogAmpSlaveARMv7_Android
@@ -170,23 +170,21 @@ function connect_40 {
export TARGET_ANT_HOME=/usr/share/ant
export NDK_ROOT=/opt-linux-x86_64/android-ndk
- export ANDROID_HOME=/opt-linux-x86/android-sdk-linux_x86
+ export ANDROID_HOME=/opt-linux-x86_64/android-sdk-linux_x86_64
export ANDROID_BUILD_TOOLS_VERSION=21.1.2
echo NDK_ROOT $NDK_ROOT
echo ANDROID_HOME $ANDROID_HOME
echo ANDROID_BUILD_TOOLS_VERSION $ANDROID_BUILD_TOOLS_VERSION
- export ANDROID_VERSION=9
- export SOURCE_LEVEL=1.6
- export TARGET_LEVEL=1.6
- export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+ export ANDROID_VERSION=24
+ 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 GCC_VERSION=4.4.3
- #export GCC_VERSION=4.7
- export GCC_VERSION=4.8
+ export GCC_VERSION=4.9
export HOST_ARCH=linux-x86_64
export TARGET_TRIPLE=arm-linux-androideabi
@@ -195,6 +193,7 @@ function connect_40 {
# Need to add toolchain bins to the PATH.
export PATH_VANILLA=$PATH
+ # TODO: Check/Replace $ANDROID_HOME/build-tools/$ANDROID_BUILD_TOOLS_VERSION for aapt, dx, dexdump, zipalign etc
export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH"
export GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-android-armv6.xml
@@ -218,7 +217,7 @@ function connect_40 {
function connect_41 {
. ./profile.ant
- . ./profile.amd64.j2se8
+ . ./profile.amd64.j2se11
export NODE_LABEL=label/android-aarch64
HOST_ROOT=/home/jogamp/JogAmpSlaveArm64_Android
@@ -239,17 +238,17 @@ function connect_41 {
export TARGET_ANT_HOME=/usr/share/ant
export NDK_ROOT=/opt-linux-x86_64/android-ndk
- export ANDROID_HOME=/opt-linux-x86/android-sdk-linux_x86
+ export ANDROID_HOME=/opt-linux-x86_64/android-sdk-linux_x86_64
export ANDROID_BUILD_TOOLS_VERSION=21.1.2
echo NDK_ROOT $NDK_ROOT
echo ANDROID_HOME $ANDROID_HOME
echo ANDROID_BUILD_TOOLS_VERSION $ANDROID_BUILD_TOOLS_VERSION
- export ANDROID_VERSION=21
- export SOURCE_LEVEL=1.6
- export TARGET_LEVEL=1.6
- export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+ export ANDROID_VERSION=24
+ 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"
@@ -262,6 +261,7 @@ function connect_41 {
# Need to add toolchain bins to the PATH.
export PATH_VANILLA=$PATH
+ # TODO: Check/Replace $ANDROID_HOME/build-tools/$ANDROID_BUILD_TOOLS_VERSION for aapt, dx, dexdump, zipalign etc
export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH"
export GLUEGEN_CPPTASKS_FILE=make/lib/gluegen-cpptasks-android-aarch64.xml
diff --git a/jenkins-server-slave-setup/scripts/start.jenkins.sh b/jenkins-server-slave-setup/scripts/start.jenkins.sh
index 5905310..12d238f 100755
--- a/jenkins-server-slave-setup/scripts/start.jenkins.sh
+++ b/jenkins-server-slave-setup/scripts/start.jenkins.sh
@@ -18,11 +18,14 @@ cd $JENKINS_HOME
nohup nice $JAVA -server -Xmx1024m -jar $JENKINS_WAR --httpPort=8080 --prefix=/chuck > $JENKINS_LOG 2>&1 &
# nohup nice $JAVA -server -Xmx1024m -jar $JENKINS_WAR --httpPort=-1 --httpsPort=8080 --prefix=/chuck > $JENKINS_LOG 2>&1 &
-sleep 9s
#pre-seed current version of agent.jar
+rm -f $JENKINS_HOME/war/agent.jar
+sleep 9s
curl -s -o $JENKINS_HOME/war/agent.jar https://jogamp.org/chuck/jnlpJars/agent.jar
if [ ! -e $JENKINS_HOME/war/agent.jar ] ; then
echo failure to copy agent.jar into deflated war folder!
+else
+ ls -la $JENKINS_HOME/war/agent.jar
fi
diff --git a/server/setup/05-service-settings/etc/apache2/mods-available/fcgid.conf b/server/setup/05-service-settings/etc/apache2/mods-available/fcgid.conf
new file mode 100644
index 0000000..cde267d
--- /dev/null
+++ b/server/setup/05-service-settings/etc/apache2/mods-available/fcgid.conf
@@ -0,0 +1,9 @@
+<IfModule mod_fcgid.c>
+ FcgidConnectTimeout 20
+ FcgidMaxRequestLen 2000000
+
+ <IfModule mod_mime.c>
+ AddHandler fcgid-script .fcgi
+ </IfModule>
+</IfModule>
+~
diff --git a/server/setup/05-service-settings/etc/apache2/sites-available/jogamp_org-ssl.conf b/server/setup/05-service-settings/etc/apache2/sites-available/jogamp_org-ssl.conf
index de8ce37..cc27035 100644
--- a/server/setup/05-service-settings/etc/apache2/sites-available/jogamp_org-ssl.conf
+++ b/server/setup/05-service-settings/etc/apache2/sites-available/jogamp_org-ssl.conf
@@ -196,7 +196,7 @@
AllowOverride All
Require all granted
AddHandler fcgid-script .php
- FcgidWrapper /srv/www/scripts/php7.0-wrapper .php
+ FcgidWrapper /srv/www/scripts/php7-wrapper .php
</Directory>
<Directory /srv/www/jogamp.org/bugzilla>
diff --git a/server/setup/05-service-settings/etc/apache2/sites-available/jogamp_org.conf b/server/setup/05-service-settings/etc/apache2/sites-available/jogamp_org.conf
index 155cf84..8cb5e37 100644
--- a/server/setup/05-service-settings/etc/apache2/sites-available/jogamp_org.conf
+++ b/server/setup/05-service-settings/etc/apache2/sites-available/jogamp_org.conf
@@ -38,7 +38,7 @@
AllowOverride All
Require all granted
AddHandler fcgid-script .php
- FcgidWrapper /srv/www/scripts/php7.0-wrapper .php
+ FcgidWrapper /srv/www/scripts/php7-wrapper .php
</Directory>
#SetEnv GIT_PROJECT_ROOT /srv/scm
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-30 21:01:17 +0000