jenkins-builds: Add aggregate_builds.sh (script replacing dropped jenkins aggregation), adopt promote-latest-builds.sh to original job naming-scheme and reduced os_and_arch set

2 files changed, 72 insertions, 10 deletions

diff --git a/jenkins-builds/aggregate_builds.sh b/jenkins-builds/aggregate_builds.sh
new file mode 100755
index 0000000..e57ae16
--- /dev/null
+++ b/jenkins-builds/aggregate_builds.sh
@@ -0,0 +1,59 @@
+#! /bin/bash
+
+git_branch=master
+dest_root=/srv/www/jogamp.org/deployment/autobuilds/${git_branch}/last
+
+rm -rf ${dest_root}
+mkdir -p ${dest_root}
+
+modules="gluegen joal joal-demos jogl jogl-demos jocl jocl-demos"
+modules_master="gluegen_onmaster joal_onmaster jogl_onmaster jogl-demos_onmaster jocl_onmaster"
+nodes="android-arm64 linux-arm64 linux-x86_64 macos-x86_64 windows-x86_64 linux-x86_64-master-001"
+
+this_dir=`pwd`
+
+function node_expected() {
+    node=$1
+    for x in ${nodes}; do
+        if [ "${x}" = "${node}" ]; then
+            return 0
+        fi
+    done
+    return 1
+}
+
+function copy_tree() {
+    for module in ${modules} ${modules_master} ; do
+        build_number=
+        dest_dir=
+        module_root_dir=/srv/jenkins/jobs/${module}/configurations/axis-label
+        cd ${module_root_dir}
+        for node in `find . -maxdepth 1 -type d` ; do 
+            if [ "${node}" != "." -a "${node}" != ".." ] ; then
+                node=`basename ${node}`
+                if node_expected ${node} ; then
+                    module_node_dir=${module_root_dir}/${node}/builds
+                    cd ${module_node_dir}
+                    if [ -z "${build_number}" ] ; then
+                        build_number=`ls -rt  | egrep "^([0-9]+)$" | sort -ug | tail -1`
+                        dest_dir=${dest_root}/${module}-b${build_number}
+                    fi
+                    build_dir=${module_node_dir}/${build_number}/archive/build
+                    if [ ! -e ${build_dir} ] ; then
+                        echo "Error: ${build_dir} doesn't exist: module ${module}, node ${node}, build ${build_number}!"
+                        exit 1
+                    fi
+                    echo "Copying module ${module}, build ${build_number}, node ${node}"
+                    mkdir -p ${dest_dir}
+                    cp -a ${build_dir}/* ${dest_dir}/
+                else
+                    echo "Skipping module ${module}, node ${node}!"
+                fi
+            fi
+        done
+        echo ""
+    done
+}
+
+copy_tree
+
diff --git a/jenkins-builds/promote-latest-builds.sh b/jenkins-builds/promote-latest-builds.sh
index 076e4e0..b010069 100755
--- a/jenkins-builds/promote-latest-builds.sh
+++ b/jenkins-builds/promote-latest-builds.sh
@@ -34,12 +34,15 @@ logfile=$thisdir/`basename $0 .sh`.log
 . $sdir/../deployment/funcs_jars_pack_sign.sh
 
 archivedir=/srv/www/jogamp.org/deployment/archive/$branch
-rootdir=/srv/www/jogamp.org/deployment/autobuilds/$branch
+rootdir=/srv/www/jogamp.org/deployment/autobuilds/$branch/last
 
 #os_and_archs_fatpack_minus_master="linux-i586 linux-armv6 linux-armv6hf macosx-universal windows-amd64 windows-i586 solaris-i586 solaris-amd64"
-os_and_archs_fatpack_minus_master="linux-i586 linux-armv6hf linux-aarch64 macosx-universal windows-amd64 windows-i586"
-os_and_archs_android="android-armv6 android-aarch64 android-x86"
-os_and_archs_ios="ios-amd64 ios-arm64"
+#os_and_archs_fatpack_minus_master="linux-i586 linux-armv6hf linux-aarch64 macosx-universal windows-amd64 windows-i586"
+#os_and_archs_android="android-armv6 android-aarch64 android-x86"
+#os_and_archs_ios="ios-amd64 ios-arm64"
+os_and_archs_fatpack_minus_master="linux-aarch64 macosx-universal windows-amd64"
+os_and_archs_android="android-armv6"
+os_and_archs_ios=""
 masterpick="linux-amd64"
 os_and_archs_minus_master="$os_and_archs_fatpack_minus_master $os_and_archs_android $os_and_archs_ios"
 os_and_archs_fatpack="$masterpick $os_and_archs_fatpack_minus_master"
@@ -69,7 +72,7 @@ function promote-latest-builds() {
 
     gluegenslave=`prom_lslatest gluegen-b`
     bgluegenslave=`prom_buildnumber_2 $gluegenslave`
-    gluegenmaster=`prom_lslatest gluegen-master-b`
+    gluegenmaster=`prom_lslatest gluegen_onmaster-b`
     bgluegenmaster=`prom_buildnumber_3 $gluegenmaster`
     echo
     echo GLUEGEN
@@ -90,7 +93,7 @@ function promote-latest-builds() {
 
     joalslave=`prom_lslatest joal-b`
     bjoalslave=`prom_buildnumber_2 $joalslave`
-    joalmaster=`prom_lslatest joal-master-b`
+    joalmaster=`prom_lslatest joal_onmaster-b`
     bjoalmaster=`prom_buildnumber_3 $joalmaster`
     echo
     echo JOAL
@@ -110,7 +113,7 @@ function promote-latest-builds() {
 
     joaldemosslave=`prom_lslatest joal-demos-b`
     bjoaldemosslave=`prom_buildnumber_3 $joaldemosslave`
-    joaldemosmaster=`prom_lslatest joal-demos-master-b`
+    joaldemosmaster=`prom_lslatest joal-demos_onmaster-b`
     bjoaldemosmaster=`prom_buildnumber_4 $joaldemosmaster`
     echo
     echo JOAL DEMOS
@@ -125,7 +128,7 @@ function promote-latest-builds() {
 
     joglslave=`prom_lslatest jogl-b`
     bjoglslave=`prom_buildnumber_2 $joglslave`
-    joglmaster=`prom_lslatest jogl-master-b`
+    joglmaster=`prom_lslatest jogl_onmaster-b`
     bjoglmaster=`prom_buildnumber_3 $joglmaster`
     echo
     echo JOGL
@@ -145,7 +148,7 @@ function promote-latest-builds() {
 
     jogldemosslave=`prom_lslatest jogl-demos-b`
     bjogldemosslave=`prom_buildnumber_3 $jogldemosslave`
-    jogldemosmaster=`prom_lslatest jogl-demos-master-b`
+    jogldemosmaster=`prom_lslatest jogl-demos_onmaster-b`
     bjogldemosmaster=`prom_buildnumber_4 $jogldemosmaster`
     echo
     echo JOGL DEMOS
@@ -164,7 +167,7 @@ function promote-latest-builds() {
 
     joclslave=`prom_lslatest jocl-b`
     bjoclslave=`prom_buildnumber_2 $joclslave`
-    joclmaster=`prom_lslatest jocl-master-b`
+    joclmaster=`prom_lslatest jocl_onmaster-b`
     bjoclmaster=`prom_buildnumber_3 $joclmaster`
     echo
     echo JOCL