summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbuild.sh3
-rw-r--r--tools/builder_common.sh6
2 files changed, 4 insertions, 5 deletions
diff --git a/build.sh b/build.sh
index a1b4ded..48367a6 100755
--- a/build.sh
+++ b/build.sh
@@ -332,9 +332,6 @@ fi
echo ">>> Building image type(s): ${_IMAGESTOBUILD}"
if [ -n "${SNAPSHOTS}" ]; then
- rm -f $SNAPSHOTSLOGFILE; touch $SNAPSHOTSLOGFILE
- rm -f $SNAPSHOTSLASTUPDATE; touch $SNAPSHOTSLASTUPDATE
-
snapshots_rotate_logfile
snapshots_update_status ">>> Starting snapshot build operations"
diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index 691bb4e..f1f6a76 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -1951,12 +1951,14 @@ snapshots_update_status() {
# Copy the current log file to $filename.old on
# the snapshot www server (real time logs)
snapshots_rotate_logfile() {
- if [ -n "$MASTER_BUILDER_SSH_LOG_DEST" -a -z "${DO_NOT_UPLOAD}" ]; then
+ if [ -z "${DO_NOT_UPLOAD}" -a -n "${RSYNCIP}" ]; then
scp -q $SNAPSHOTSLOGFILE ${RSYNCUSER}@${RSYNCIP}:${RSYNCLOGS}/build.log.old
fi
# Cleanup log file
- echo "" > $SNAPSHOTSLOGFILE
+ rm -f $SNAPSHOTSLOGFILE; touch $SNAPSHOTSLOGFILE
+ rm -f $SNAPSHOTSLASTUPDATE; touch $SNAPSHOTSLASTUPDATE
+
}
snapshots_copy_to_staging_nanobsd() {
OpenPOWER on IntegriCloud