Changeset 765 for rpmbuild-bot

Timestamp:

May 27, 2016, 12:49:59 AM (9 years ago)

Author:

dmik

Message:

rpmbuid-bot: Add move command to move packages between repositories.

File:

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

rpmbuild-bot/rpmbuild-bot.sh

@@ -23 +23 @@
 #
 # > rpmbuild-bot.sh SPEC[=VERSION]
-# >                 [ upload[=REPO] | test[=MODE] | clean[=test] | remove[=REPO] ]
+# >                 [ upload[=REPO] | test[=MODE] | clean[=test] |
+# >                   move[=FROM_REPO=TO_REPO] | remove[=REPO] ]
 # >                 [-f]
 #
@@ -81 +82 @@
 #
 # It is possible to configure which steps of the build to perform using the MODE
-# argument to the "test" command which may take one of the following values:
+# parameter to the "test" command which may take one of the following values:
 #
 #   prep    Execute the %prep section of the spec file only.
@@ -93 +94 @@
 #           necessary for "pack" to succeed.
 #
-# When no MODE argument is given, all steps are executed in a proper order.
+# When no MODE parameter is given, all steps are executed in a proper order.
 #
 # The results of the "test" command are stored in a log file in the logs/test
@@ -108 +109 @@
 # The "upload" command will upload the packages built with the "build"
 # command to the official distribution channel configured in
-# rpmbuild-bot-env.sh. The REPO argument specifies one of the configured
+# rpmbuild-bot-env.sh. The REPO parameter specifies one of the configured
 # repositories. When REPO is not given, the default repository is used
 # (usually experimental or similar).
@@ -130 +131 @@
 # otherwise.
 #
-# If the "clean" command is given a "test" argument, it will clean up the
+# If the "clean" command is given a "test" parameter, 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.
+#
+# Moving packages between repositories
+# ------------------------------------
+#
+# The "move" command allows to move a particular version of the packages
+# built with the "build" command and uploaded with the "upload" command from one
+# repository to another one. The "move" command is normally used to move
+# packages from a test repository to a production one when they are ready for
+# wide distribution.
+#
+# The "move" command needs log files from the "build" and "upload" commands
+# and will fail otherwise. It also requires the VERSION parameter for the SPEC
+# argument to be given (to specify the version of the packages to remove) and
+# requires the FROM_REPO=TO_REPO parameter itself to specify the source
+# repository and the target repository, respectively.
+#
+# The log files from the "build" and "upload" commands are not removed by the
+# "move" command so it may be performed multiple times. The current location
+# of the packages is not tracked in the log files so the command will fail
+# if the source repository doesn't have the package files or if the target
+# repository already has them.
 #
 # Removing packages
@@ -144 +166 @@
 #
 # The "remove" command needs log files from the "build" and "upload" commands
-# and will fail otherwise. It also requires the VERSION argument for the SPEC
-# parameter to be given (to specify the version of the packages to remove) and
-# accepts the REPO argument just like the "upload" command does (to specify a
-# repository to remove the packages from).
-#
-# Note that the log files from the "build" and "upload" commands are also removed
-# by this command upon sucessful package removal.
+# and will fail otherwise. It also requires the VERSION parameter for the SPEC
+# argument to be given (to specify the version of the packages to remove) and
+# accepts the REPO parameter itself just like the "upload" command does (to
+# specify a repository to remove the packages from).
+#
+# Note that the log files from the "build" and "upload" commands are also
+# removed by this command upon sucessful package removal.
 #
 # Return value
@@ -212 +234 @@
 read_file_list()
 {
-  # $1 = file list list filename
-  # $2 = var name where to save read file names (optional)
-  # $3 = function name to call for each file (optional)
+  # $1 = file list filename
+  # $2 = var name where to save the list of read file names (optional)
+  # $3 = function name to call for each file (optional), it may assign a new
+  #      file name to $file and also set $file_pre and $file_post that will
+  #      be prepended and appended to $file when saving it to the list in $2
+  #      (but not when checking for file existence and timestamp)
 
   local list="$1"
@@ -221 +246 @@
   # Check timestamps.
   while read l; do
+    local file_pre=
+    local file_post=
     local file="${l#*|}"
     local ts="${l%%|*}"
@@ -231 +258 @@
       die "Recorded timestamp $ts doesn't match actual timestamp $act_ts for '$file'."
     fi
-    _read_file_list_ret="$_read_file_list_ret${_read_file_list_ret:+ }$file"
+    _read_file_list_ret="$_read_file_list_ret${_read_file_list_ret:+ }$file_pre$file$file_post"
   done < "$list"
   # Return the files (if requested).
@@ -539 +566 @@
 }
 
-remove_cmd()
+move_cmd()
 {
   # Check settings.
@@ -546 +573 @@
   test -n "$RPMBUILD_BOT_UPLOAD_REPO_LIST" || die "RPMBUILD_BOT_UPLOAD_REPO_LIST is empty."
 
+  local from_repo="${command_arg%%=*}"
+  local to_repo="${command_arg#*=}"
+
+  [ -n "$from_repo" ] || die "FROM_REPO parameter is missing."
+  [ "$from_repo" = "$to_repo" ] && die "TO_REPO parameter is missing (or equals to FROM_REPO)."
+
+  check_dir_var "RPMBUILD_BOT_UPLOAD_${from_repo}_DIR"
+  check_dir_var "RPMBUILD_BOT_UPLOAD_${to_repo}_DIR"
+
+  local ver_list="$log_dir/archive/$spec_name.$spec_ver.list"
+  [ -f "$ver_list" ] || die "File '$ver_list' is not found."
+
+  eval local from_base="\$RPMBUILD_BOT_UPLOAD_${from_repo}_DIR"
+  eval local to_base="\$RPMBUILD_BOT_UPLOAD_${to_repo}_DIR"
+
+  local files=
+  read_file_list "$ver_list" files '
+local dir=
+local base="$from_base"; repo_dir_for_file "$file" dir; file="${dir}/${file##*/}"
+base="$to_base"; repo_dir_for_file "$file" dir; file_post=">${dir}"
+'
+  for f in $files; do
+    local from="${f%%>*}"
+    local to="${f#*>}"
+    echo "Moving $from to $to/..."
+    run mv "$from" "$to/"
+  done
+}
+
+remove_cmd()
+{
+  # Check settings.
+  [ -n "$spec_ver" ] || die "SPEC parameter lacks version specification."
+
+  test -n "$RPMBUILD_BOT_UPLOAD_REPO_LIST" || die "RPMBUILD_BOT_UPLOAD_REPO_LIST is empty."
+
   local repo="$command_arg"
   [ -z "$repo" ] && repo="${RPMBUILD_BOT_UPLOAD_REPO_LIST%% *}"
@@ -551 +614 @@
   check_dir_var "RPMBUILD_BOT_UPLOAD_${repo}_DIR"
 
-  eval local base="\$RPMBUILD_BOT_UPLOAD_${repo}_DIR"
-
   local ver_list="$log_dir/archive/$spec_name.$spec_ver.list"
   [ -f "$ver_list" ] || die "File '$ver_list' is not found."
+
+  eval local base="\$RPMBUILD_BOT_UPLOAD_${repo}_DIR"
 
   local files=
@@ -613 +676 @@
 [ "$spec" = "$spec_ver" ] && spec_ver=
 
-command_name="${command%=*}"
+command_name="${command%%=*}"
 command_arg="${command#*=}"
 [ "$command_name" = "$command_arg" ] && command_arg=
@@ -624 +687 @@
     need_spec_file=1
     ;;
-  upload|clean|remove)
+  upload|clean|move|remove)
     ;;
   *) usage
@@ -662 +725 @@
 run mkdir -p "$zip_dir"
 
-[ -z "$command" ] && command="build"
-
-command_name="${command%=*}"
-comand_arg="${command#*=}"
-[ "$command_name" = "$command_arg" ] && command_arg=
-
 log_base="$log_dir/$spec_name"
 spec_list="$log_base.list"