Move upload cmds from outside an "if master" test so all versions get uploaded

Author: Ralph Castain

contrib/build-server/hwloc-nightly-tarball.sh

@@ -106,19 +106,20 @@ for branch in $branches; do
         test "$branch" = "master"; then
         echo "=== Saving output for a Coverity run"
         echo "$outputroot/$branch/hwloc-$latest_snapshot.tar.bz2" >> $pending_coverity
-        echo "=== Posting tarball to open-mpi.org"
-        # tell the web server to cleanup old nightly tarballs
-        ssh -p 2222 [email protected] "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.* [email protected]:public_html/software/hwloc/nightly/$branch/
-        scp -P 2222 $outputroot/$branch/latest_snapshot.txt [email protected]:public_html/software/hwloc/nightly/$branch/
-        # direct the web server to regenerate the checksums
-        ssh -p 2222 [email protected] "cd public_html/software/hwloc/nightly/$branch && md5sum hwloc* > md5sums.txt"
-        ssh -p 2222 [email protected] "cd public_html/software/hwloc/nightly/$branch && sha1sum hwloc* > sha1sums.txt"
     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 [email protected] "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.* [email protected]:public_html/software/hwloc/nightly/$branch/
+    scp -P 2222 $outputroot/$branch/latest_snapshot.txt [email protected]:public_html/software/hwloc/nightly/$branch/
+    # direct the web server to regenerate the checksums
+    ssh -p 2222 [email protected] "cd public_html/software/hwloc/nightly/$branch && md5sum hwloc* > md5sums.txt"
+    ssh -p 2222 [email protected] "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

contrib/build-server/openmpi-nightly-tarball.sh

@@ -117,18 +117,20 @@ for branch in $branches; do
         test "$branch" = "master"; then
         echo "=== Saving output for a Coverity run"
         echo "$outputroot/$branch/openmpi-$latest_snapshot.tar.bz2" >> $pending_coverity
-        # tell the web server to cleanup old nightly tarballs
-        ssh -p 2222 [email protected] "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.* [email protected]:public_html/nightly/$branch/
-        scp -P 2222 $outputroot/$branch/latest_snapshot.txt [email protected]:public_html/nightly/$branch/
-        # direct the web server to regenerate the checksums
-        ssh -p 2222 [email protected] "cd public_html/nightly/$branch && md5sum openmpi* > md5sums.txt"
-        ssh -p 2222 [email protected] "cd public_html/nightly/$branch && sha1sum openmpi* > sha1sums.txt"
     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 [email protected] "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.* [email protected]:public_html/nightly/$branch/
+    scp -P 2222 $outputroot/$branch/latest_snapshot.txt [email protected]:public_html/nightly/$branch/
+    # direct the web server to regenerate the checksums
+    ssh -p 2222 [email protected] "cd public_html/nightly/$branch && md5sum openmpi* > md5sums.txt"
+    ssh -p 2222 [email protected] "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

contrib/build-server/pmix-nightly-tarball.sh

@@ -116,19 +116,20 @@ for branch in $branches; do
         test "$branch" = "master"; then
         echo "=== Saving output for a Coverity run"
         echo "$outputroot/$branch/pmix-$latest_snapshot.tar.bz2" >> $pending_coverity
-        echo "=== Posting tarball to open-mpi.org"
-        # tell the web server to cleanup old nightly tarballs
-        ssh -p 2222 [email protected] "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.* [email protected]:public_html/software/pmix/nightly/$branch/
-        scp -P 2222 $outputroot/$branch/latest_snapshot.txt [email protected]:public_html/software/pmix/nightly/$branch/
-        # direct the web server to regenerate the checksums
-        ssh -p 2222 [email protected] "cd public_html/software/pmix/nightly/$branch && md5sum pmix* > md5sums.txt"
-        ssh -p 2222 [email protected] "cd public_html/software/pmix/nightly/$branch && sha1sum pmix* > sha1sums.txt"
     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 [email protected] "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.* [email protected]:public_html/software/pmix/nightly/$branch/
+    scp -P 2222 $outputroot/$branch/latest_snapshot.txt [email protected]:public_html/software/pmix/nightly/$branch/
+    # direct the web server to regenerate the checksums
+    ssh -p 2222 [email protected] "cd public_html/software/pmix/nightly/$branch && md5sum pmix* > md5sums.txt"
+    ssh -p 2222 [email protected] "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