diff options
| -rwxr-xr-x | jenkins-builds/funcs_promotion.sh | 8 | ||||
| -rwxr-xr-x | jenkins-builds/promote-latest-builds.sh | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/jenkins-builds/funcs_promotion.sh b/jenkins-builds/funcs_promotion.sh index cd3d6cd..3e8f810 100755 --- a/jenkins-builds/funcs_promotion.sh +++ b/jenkins-builds/funcs_promotion.sh @@ -113,7 +113,7 @@ function prom_promote_files() { local zfile=`find archive/$i -name $module\*$i.7z` local zfolder=tmp/`basename $zfile .7z` for sub in $submodules ; do - jars=`find $zfolder/jar -maxdepth 1 -name $sub\*$i.jar` + local jars=`find $zfolder/jar -maxdepth 1 -name $sub\*$i.jar` if [ -z "$jars" ] ; then echo "ERROR: No platform JAR file for module $module, sub $sub, platform $i, sdir $sourcedir" exit 1 @@ -122,7 +122,7 @@ function prom_promote_files() { cp -av $j ./jar/ done if [ -e $zfolder/jar/atomic ] ; then - jars=`find $zfolder/jar/atomic -maxdepth 1 -name $sub\*$i.jar` + local jars=`find $zfolder/jar/atomic -maxdepth 1 -name $sub\*$i.jar` if [ -z "$jars" ] ; then echo "ERROR: No platform JAR file (atomic) for module $module, sub $sub, platform $i, sdir $sourcedir" exit 1 @@ -144,7 +144,7 @@ function prom_promote_files() { exit 1 fi if [ -e $zfolder/jar/atomic ] ; then - jars=`find $zfolder/jar/atomic -maxdepth 1 -name $sub\*$masterpick.jar` + local jars=`find $zfolder/jar/atomic -maxdepth 1 -name $sub\*$masterpick.jar` if [ -z "$jars" ] ; then echo "ERROR: No platform JAR file (atomic) for module $module, sub $sub, platform $i, sdir $sourcedir" exit 1 @@ -156,7 +156,7 @@ function prom_promote_files() { exit 1 fi for j in $jars ; do - cp -av $j ./jar/atomic/ + cp -av $j ./jar/ done if [ -e $zfolder/jar/atomic ] ; then local jars=`find $zfolder/jar/atomic -maxdepth 1 -name $sub\*.jar` diff --git a/jenkins-builds/promote-latest-builds.sh b/jenkins-builds/promote-latest-builds.sh index 7d21dca..e004434 100755 --- a/jenkins-builds/promote-latest-builds.sh +++ b/jenkins-builds/promote-latest-builds.sh @@ -188,6 +188,7 @@ function promote-latest-builds() { ######################################################### prom_integrity_check $dest jar tmp/dump + prom_integrity_check $dest jar/atomic tmp/dump prom_integrity_check $dest joal-demos/jar tmp/dump prom_integrity_check $dest jogl-demos/jar tmp/dump prom_integrity_check $dest jocl-demos/jar tmp/dump |