18874: Make `run-tests.sh --only services/workbench2` work.

[arvados.git] / build / run-build-packages-one-target.sh

diff --git a/build/run-build-packages-one-target.sh b/build/run-build-packages-one-target.sh
index 905af1cbc62a76cc314ccba3dcdd9fa1145d2586..7b51264cee80fe3703bfa8a057b41a679eb2f658 100755 (executable)
--- a/build/run-build-packages-one-target.sh
+++ b/build/run-build-packages-one-target.sh
@@ -139,16 +139,14 @@ fi
 
 if [[ -n "$test_packages" ]]; then
   if [[ -n "$(find $WORKSPACE/packages/$TARGET -name '*.rpm')" ]] ; then
-    set +e
-    /usr/bin/which createrepo >/dev/null
-    if [[ "$?" != "0" ]]; then
+    CREATEREPO="$(command -v createrepo createrepo_c | tail -n1)"
+    if [[ -z "$CREATEREPO" ]]; then
       echo >&2
-      echo >&2 "Error: please install createrepo. E.g. sudo apt-get install createrepo"
+      echo >&2 "Error: please install createrepo. E.g. sudo apt install createrepo-c"
       echo >&2
       exit 1
     fi
-    set -e
-    createrepo $WORKSPACE/packages/$TARGET
+    "$CREATEREPO" $WORKSPACE/packages/$TARGET
   fi
 
   if [[ -n "$(find $WORKSPACE/packages/$TARGET -name '*.deb')" ]] ; then
@@ -222,7 +220,6 @@ if test -z "$packages" ; then
         crunch-dispatch-local
         crunch-dispatch-slurm
         crunch-run
-        crunchstat
         keepproxy
         keepstore
         keep-balance