diff options
| -rwxr-xr-x | jenkins-builds/funcs_promotion.sh | 21 | ||||
| -rwxr-xr-x | jenkins-builds/promote-latest-builds.sh | 7 |
2 files changed, 15 insertions, 13 deletions
diff --git a/jenkins-builds/funcs_promotion.sh b/jenkins-builds/funcs_promotion.sh index 48d4f8d..34eb684 100755 --- a/jenkins-builds/funcs_promotion.sh +++ b/jenkins-builds/funcs_promotion.sh @@ -2,14 +2,9 @@ function prom_setup() { - local lrootdir=$1 - shift local ldest=$1 shift - local lthisdir=`pwd` - cd $lrootdir - rm -rf $ldest mkdir $ldest mkdir $ldest/archive @@ -24,8 +19,6 @@ function prom_setup() { mkdir $ldest/log mkdir $ldest/resources mkdir $ldest/tmp - - cd $lthisdir } function prom_lslatest() { @@ -68,6 +61,9 @@ function prom_verify_artifacts() { } function prom_merge_modules() { + # debug + # set -x + local destdir=$1 shift local modules=$* @@ -193,6 +189,9 @@ function prom_merge_modules() { # promote_files jogl /builds/jogl-b211 tmp-archive # function prom_promote_module() { + # debug + # set -x + local module=$1 shift local sourcedir=$1 @@ -243,14 +242,16 @@ function prom_promote_module() { # 7z folder verfified above already local zfile=archive/jogamp-$masterpick/$module-$masterpick.7z local zfolder=tmp/`basename $zfile .7z` - for j in $zfolder/jar/*.jar ; do - cp -av $j ./jar/ + if [ -e $zfolder/jar ] ; then + for j in $zfolder/jar/*.jar ; do + cp -av $j ./jar/ + done if [ -e $zfolder/jar/atomic ] ; then for j in $zfolder/jar/atomic/*.jar ; do cp -av $j ./jar/atomic/ done fi - done + fi cp -av $zfolder/jnlp-files/* ./jnlp-files/ if [ -e $zfolder/resources ] ; then cp -av $zfolder/resources/* ./resources/ diff --git a/jenkins-builds/promote-latest-builds.sh b/jenkins-builds/promote-latest-builds.sh index 3bcb74b..2cff133 100755 --- a/jenkins-builds/promote-latest-builds.sh +++ b/jenkins-builds/promote-latest-builds.sh @@ -38,10 +38,11 @@ os_and_archs_minus_one="linux-i586 linux-armv7 linux-armv7hf android-armv7 macos masterpick="linux-amd64" os_and_archs="$masterpick $os_and_archs_minus_one" -dest=tmp-archive - cd $rootdir +dest=tmp-archive +rm -rf $dest + function promote-latest-builds() { echo echo "Promotion of latest files" @@ -52,7 +53,7 @@ function promote-latest-builds() { echo echo `date` echo - prom_setup $rootdir $dest + prom_setup $dest gluegenslave=`prom_lslatest gluegen-b` bgluegenslave=`prom_buildnumber_2 $gluegenslave` |