X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7ace810444b70fa6d9840fb25a7e20e836e3e2c5..d1a6af60533f6d1fb4d4f00f7556f0d8500db3b9:/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 41b480e697..7b51264cee 100755 --- 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 @@ -215,13 +213,13 @@ if test -z "$packages" ; then arvados-server arvados-src arvados-sync-groups + arvados-sync-users arvados-workbench arvados-workbench2 arvados-ws crunch-dispatch-local crunch-dispatch-slurm crunch-run - crunchstat keepproxy keepstore keep-balance @@ -231,7 +229,6 @@ if test -z "$packages" ; then keep-rsync keep-block-check keep-web - libarvados-perl libpam-arvados-go python3-cwltest python3-arvados-fuse