Changeset 739

Timestamp:

Apr 11, 2016, 8:56:45 PM (9 years ago)

Author:

dmik

Message:

rpmbuild-bot: Add support for clean=test command.

This cleans up the results of the "test" command instead
of "build".

File:

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

rpmbuild-bot/rpmbuild-bot.sh ¶

@@ -32 +32 @@
 #
 # > rpmbuild-bot.sh SPEC[=VERSION]
-# >                 [ upload[=REPO] | test[=MODE] | clean | remove[=REPO] ]
+# >                 [ upload[=REPO] | test[=MODE] | clean[=test] | remove[=REPO] ]
 # >                 [-f]
 #
@@ -124 +124 @@
 # tree state, wrong patches etc.). Note that normally you don't need to use
 # this command; it's an emergency-only tool.
+#
+# The "clean" command needs log files from the "build" command and will fail
+# otherwise.
+#
+# If the "clean" command is given a "test" argument, it will clean up the
+# results of the "test" command instead of "build". The log file from the
+# "test" command needs to be present or the command will fail.
 #
 # Removing packages
@@ -237 +244 @@
 build_cmd()
 {
-  # Check settings.
-  test -n "$RPMBUILD_BOT_ARCH_LIST" || die "RPMBUILD_BOT_ARCH_LIST is empty."
-
   local base_arch="${RPMBUILD_BOT_ARCH_LIST##* }"
 
@@ -382 +386 @@
     if [ -n "$rpms" ] ; then
       echo "Successfully generated the following RPMs:"
-      for f in $rpms ; do
+      for f in $rpms; do
         echo "$f"
       done
@@ -463 +467 @@
 clean_cmd()
 {
+  if [ "$command_arg" = "test" ] ; then
+    # Cleanup after "test" command.
+    local base_arch="${RPMBUILD_BOT_ARCH_LIST##* }"
+    local log_file="$log_dir/test/$spec_name.log"
+
+    [ -f "$log_file" ] || die "File '$test_log' is not found."
+
+    local rpms=`grep "^Wrote: \+.*\.\($base_arch\.rpm\|noarch\.rpm\)$" "$log_file" | sed -e "s#^Wrote: \+##g"`
+    if [ -n "$rpms" ] ; then
+      for f in $rpms; do
+        echo "Removing $f..."
+        run rm -f "$f"
+      done
+      echo "Removing $log_file[.bak]..."
+      run rm -f "$log_file" "$log_file".bak
+    else
+      die "Cannot find .$base_arch.rpm/.noarch.rpm file names in '$log_file'."
+    fi
+
+    return
+  fi
+
+  # Cleanup after "build command".
   [ -f "$spec_list" ] || die \
 "File '$spec_list' is not found.
@@ -613 +640 @@
 . "${0%%.sh}-env.sh"
 
+# Check common settings.
+test -n "$RPMBUILD_BOT_ARCH_LIST" || die "RPMBUILD_BOT_ARCH_LIST is empty."
+
 run eval "${command_name}_cmd"