From 16cfbf9828ea7225e76c5dee7cea7f190f5a14b8 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Tue, 2 Aug 2016 21:59:18 -0700 Subject: [PATCH] Only post tarballs if something changed --- contrib/build-server/hwloc-nightly-tarball.sh | 32 +++++++++---------- .../build-server/openmpi-nightly-tarball.sh | 32 +++++++++---------- contrib/build-server/pmix-nightly-tarball.sh | 32 +++++++++---------- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/contrib/build-server/hwloc-nightly-tarball.sh b/contrib/build-server/hwloc-nightly-tarball.sh index a5cc221fff..b4d98aa220 100755 --- a/contrib/build-server/hwloc-nightly-tarball.sh +++ b/contrib/build-server/hwloc-nightly-tarball.sh @@ -102,24 +102,24 @@ for branch in $branches; do # master (for now). latest_snapshot=`cat $outputroot/$branch/latest_snapshot.txt` echo "=== Latest snapshot: $latest_snapshot" - if test "$prev_snapshot" != "$latest_snapshot" && \ - test "$branch" = "master"; then - echo "=== Saving output for a Coverity run" - echo "$outputroot/$branch/hwloc-$latest_snapshot.tar.bz2" >> $pending_coverity - else - echo "=== NOT saving output for a Coverity run" + if test "$prev_snapshot" != "$latest_snapshot"; then + if test "$branch" = "master"; then + echo "=== Saving output for a Coverity run" + echo "$outputroot/$branch/hwloc-$latest_snapshot.tar.bz2" >> $pending_coverity + else + echo "=== NOT saving output for a Coverity run" + fi + echo "=== Posting tarball to open-mpi.org" + # tell the web server to cleanup old nightly tarballs + ssh -p 2222 ompiteam@192.185.39.252 "git/ompi/contrib/build-server/remove-old.pl 7 public_html/software/hwloc/nightly/$branch" + # upload the new ones + scp -P 2222 $outputroot/$branch/hwloc-$latest_snapshot.tar.* ompiteam@192.185.39.252:public_html/software/hwloc/nightly/$branch/ + scp -P 2222 $outputroot/$branch/latest_snapshot.txt ompiteam@192.185.39.252:public_html/software/hwloc/nightly/$branch/ + # direct the web server to regenerate the checksums + ssh -p 2222 ompiteam@192.185.39.252 "cd public_html/software/hwloc/nightly/$branch && md5sum hwloc* > md5sums.txt" + ssh -p 2222 ompiteam@192.185.39.252 "cd public_html/software/hwloc/nightly/$branch && sha1sum hwloc* > sha1sums.txt" fi - echo "=== Posting tarball to open-mpi.org" - # tell the web server to cleanup old nightly tarballs - ssh -p 2222 ompiteam@192.185.39.252 "git/ompi/contrib/build-server/remove-old.pl 7 public_html/software/hwloc/nightly/$branch" - # upload the new ones - scp -P 2222 $outputroot/$branch/hwloc-$latest_snapshot.tar.* ompiteam@192.185.39.252:public_html/software/hwloc/nightly/$branch/ - scp -P 2222 $outputroot/$branch/latest_snapshot.txt ompiteam@192.185.39.252:public_html/software/hwloc/nightly/$branch/ - # direct the web server to regenerate the checksums - ssh -p 2222 ompiteam@192.185.39.252 "cd public_html/software/hwloc/nightly/$branch && md5sum hwloc* > md5sums.txt" - ssh -p 2222 ompiteam@192.185.39.252 "cd public_html/software/hwloc/nightly/$branch && sha1sum hwloc* > sha1sums.txt" - # Failed builds are not removed. But if a human forgets to come # in here and clean up the old failed builds, we can accumulate # many over time. So remove any old failed builds that are over diff --git a/contrib/build-server/openmpi-nightly-tarball.sh b/contrib/build-server/openmpi-nightly-tarball.sh index 6120a187b1..4016b063b5 100755 --- a/contrib/build-server/openmpi-nightly-tarball.sh +++ b/contrib/build-server/openmpi-nightly-tarball.sh @@ -113,24 +113,24 @@ for branch in $branches; do # master (for now). latest_snapshot=`cat $outputroot/$branch/latest_snapshot.txt` echo "=== Latest snapshot: $latest_snapshot" - if test "$prev_snapshot" != "$latest_snapshot" && \ - test "$branch" = "master"; then - echo "=== Saving output for a Coverity run" - echo "$outputroot/$branch/openmpi-$latest_snapshot.tar.bz2" >> $pending_coverity - else - echo "=== NOT saving output for a Coverity run" + if test "$prev_snapshot" != "$latest_snapshot"; then + if test "$branch" = "master"; then + echo "=== Saving output for a Coverity run" + echo "$outputroot/$branch/openmpi-$latest_snapshot.tar.bz2" >> $pending_coverity + else + echo "=== NOT saving output for a Coverity run" + fi + echo "=== Posting tarball to open-mpi.org" + # tell the web server to cleanup old nightly tarballs + ssh -p 2222 ompiteam@192.185.39.252 "git/ompi/contrib/build-server/remove-old.pl 7 public_html/nightly/$branch" + # upload the new ones + scp -P 2222 $outputroot/$branch/openmpi-$latest_snapshot.tar.* ompiteam@192.185.39.252:public_html/nightly/$branch/ + scp -P 2222 $outputroot/$branch/latest_snapshot.txt ompiteam@192.185.39.252:public_html/nightly/$branch/ + # direct the web server to regenerate the checksums + ssh -p 2222 ompiteam@192.185.39.252 "cd public_html/nightly/$branch && md5sum openmpi* > md5sums.txt" + ssh -p 2222 ompiteam@192.185.39.252 "cd public_html/nightly/$branch && sha1sum openmpi* > sha1sums.txt" fi - echo "=== Posting tarball to open-mpi.org" - # tell the web server to cleanup old nightly tarballs - ssh -p 2222 ompiteam@192.185.39.252 "git/ompi/contrib/build-server/remove-old.pl 7 public_html/nightly/$branch" - # upload the new ones - scp -P 2222 $outputroot/$branch/openmpi-$latest_snapshot.tar.* ompiteam@192.185.39.252:public_html/nightly/$branch/ - scp -P 2222 $outputroot/$branch/latest_snapshot.txt ompiteam@192.185.39.252:public_html/nightly/$branch/ - # direct the web server to regenerate the checksums - ssh -p 2222 ompiteam@192.185.39.252 "cd public_html/nightly/$branch && md5sum openmpi* > md5sums.txt" - ssh -p 2222 ompiteam@192.185.39.252 "cd public_html/nightly/$branch && sha1sum openmpi* > sha1sums.txt" - # Failed builds are not removed. But if a human forgets to come # in here and clean up the old failed builds, we can accumulate # many over time. So remove any old failed builds that are over diff --git a/contrib/build-server/pmix-nightly-tarball.sh b/contrib/build-server/pmix-nightly-tarball.sh index 4a4bf8c84a..1105186a47 100755 --- a/contrib/build-server/pmix-nightly-tarball.sh +++ b/contrib/build-server/pmix-nightly-tarball.sh @@ -112,24 +112,24 @@ for branch in $branches; do # master (for now). latest_snapshot=`cat $outputroot/$branch/latest_snapshot.txt` echo "=== Latest snapshot: $latest_snapshot" - if test "$prev_snapshot" != "$latest_snapshot" && \ - test "$branch" = "master"; then - echo "=== Saving output for a Coverity run" - echo "$outputroot/$branch/pmix-$latest_snapshot.tar.bz2" >> $pending_coverity - else - echo "=== NOT saving output for a Coverity run" + if test "$prev_snapshot" != "$latest_snapshot"; then + if test "$branch" = "master"; then + echo "=== Saving output for a Coverity run" + echo "$outputroot/$branch/pmix-$latest_snapshot.tar.bz2" >> $pending_coverity + else + echo "=== NOT saving output for a Coverity run" + fi + echo "=== Posting tarball to open-mpi.org" + # tell the web server to cleanup old nightly tarballs + ssh -p 2222 ompiteam@192.185.39.252 "git/ompi/contrib/build-server/remove-old.pl 7 public_html/software/pmix/nightly/$branch" + # upload the new ones + scp -P 2222 $outputroot/$branch/pmix-$latest_snapshot.tar.* ompiteam@192.185.39.252:public_html/software/pmix/nightly/$branch/ + scp -P 2222 $outputroot/$branch/latest_snapshot.txt ompiteam@192.185.39.252:public_html/software/pmix/nightly/$branch/ + # direct the web server to regenerate the checksums + ssh -p 2222 ompiteam@192.185.39.252 "cd public_html/software/pmix/nightly/$branch && md5sum pmix* > md5sums.txt" + ssh -p 2222 ompiteam@192.185.39.252 "cd public_html/software/pmix/nightly/$branch && sha1sum pmix* > sha1sums.txt" fi - echo "=== Posting tarball to open-mpi.org" - # tell the web server to cleanup old nightly tarballs - ssh -p 2222 ompiteam@192.185.39.252 "git/ompi/contrib/build-server/remove-old.pl 7 public_html/software/pmix/nightly/$branch" - # upload the new ones - scp -P 2222 $outputroot/$branch/pmix-$latest_snapshot.tar.* ompiteam@192.185.39.252:public_html/software/pmix/nightly/$branch/ - scp -P 2222 $outputroot/$branch/latest_snapshot.txt ompiteam@192.185.39.252:public_html/software/pmix/nightly/$branch/ - # direct the web server to regenerate the checksums - ssh -p 2222 ompiteam@192.185.39.252 "cd public_html/software/pmix/nightly/$branch && md5sum pmix* > md5sums.txt" - ssh -p 2222 ompiteam@192.185.39.252 "cd public_html/software/pmix/nightly/$branch && sha1sum pmix* > sha1sums.txt" - # Failed builds are not removed. But if a human forgets to come # in here and clean up the old failed builds, we can accumulate # many over time. So remove any old failed bbuilds that are over