Changeset 769 for rpmbuild-bot/rpmbuild-bot.sh

Timestamp:

May 30, 2016, 6:43:54 PM (9 years ago)

Author:

dmik

Message:

rpmbuild-bot: Print elapsed time after each succeded step and overall.

The overall elapsed time is printed even on failure. Also the start and
end datetime of the overall build process is printed.

File:

• rpmbuild-bot/rpmbuild-bot.sh (modified) (11 diffs)

rpmbuild-bot/rpmbuild-bot.sh

@@ -186 +186 @@
 #
 
+print_elapsed()
+{
+  # $1 = start timestamp, in seconds (as returned by `date +%s`)
+  # $2 = string containg \$e (will be replaced with the elapsed time)
+
+  [ -z "$1" -o -z "$2" ] && return
+
+  local e=$(($(date +%s) - $1))
+  local e_min=$(($e / 60))
+  local e_sec=$(($e % 60))
+  local e_hrs=$((e_min / 60))
+  e_min=$((e_min % 60))
+  e="${e_hrs}h ${e_min}m ${e_sec}s"
+
+  eval "echo \"$2\""
+}
+
+quit()
+{
+  if [ -n "$start_time" ] ; then
+    echo "Build ended on $(date -R)."
+    if [ $1 = 0 ] ; then
+      print_elapsed start_time "Build succeeded (took \$e)."
+    else
+      print_elapsed start_time "Build failed (took \$e)."
+    fi
+  fi
+  exit $1
+}
+
 run()
 {
@@ -193 +223 @@
     echo "ERROR: The following command failed with error code $rc:"
     echo $@
-    exit $rc
+    quit $rc
   fi
 }
@@ -209 +239 @@
     echo "You will find more information in file '$log'."
     echo "Here are the last 10 lines of output:"
-    echo ""
+    echo "------------------------------------------------------------------------------"
     tail "$log" -n 10
-    exit $rc
+    echo "------------------------------------------------------------------------------"
+    quit $rc
   fi
 }
@@ -223 +254 @@
 {
   echo "ERROR: $1"
-  exit 1
+  quit 1
 }
 
@@ -254 +285 @@
     [ -n "$3" ] && eval $3
     [ -f "$file" ] || die "File '$file' is not found."
-    echo "Checking tmestamp of $file..."
+    echo "Checking timestamp of $file..."
     local act_ts=`stat -c '%Y' "$file"`
     if [ "$ts" != "$act_ts" ] ; then
@@ -269 +300 @@
   echo "Usage:"
   sed -n -e "s/rpmbuild-bot.sh/${0##*/}/g" -e 's/^# > /  /p' < "$0"
-  exit 255
+  quit 255
 }
 
@@ -328 +359 @@
   fi
 
+  local start_time=
+
   # Generate RPMs.
   for arch in $RPMBUILD_BOT_ARCH_LIST ; do
     echo "Creating RPMs for '$arch' target (logging to $log_base.$arch.log)..."
+    start_time=$(date +%s)
     log_run "$log_base.$arch.log" rpmbuild.exe --target=$arch -bb "$spec_full"
+    print_elapsed start_time "Completed in \$e."
   done
 
   # Generate SRPM.
   echo "Creating SRPM (logging to $log_base.srpm.log)..."
+  start_time=$(date +%s)
   log_run "$log_base.srpm.log" rpmbuild -bs "$spec_full"
+  print_elapsed start_time "Completed in \$e."
 
   # Find SRPM file name in the log.
@@ -360 +397 @@
   # Generate ZIP.
   echo "Creating ZIP (logging to $log_base.zip.log)..."
+  start_time=$(date +%s)
   create_zip()
   {(
@@ -374 +412 @@
   )}
   log_run "$log_base.zip.log" create_zip
+  print_elapsed start_time "Completed in \$e."
 
   local ver_list="$log_base.$ver_full.list"
@@ -730 +769 @@
 spec_list="$log_base.list"
 
+start_time=$(date +%s)
+
+echo "Build started on $(date -R)."
 echo "Package:   $spec_name"
 echo "Command:   $command $options"
@@ -741 +783 @@
 run eval "${command_name}_cmd"
 
-echo "All done."
-
-exit 0
+quit 0