13667: test fail on rpm package

Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat@veritasgenetics.com>

diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index caebac013d4db721af25655a3551371c35275782..e9a859950a9d2febd3ee5f316f7bcdec07783e9a 100755 (executable)
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -566,6 +566,8 @@ done <`dirname "$(readlink -f "$0")"`"/build.list"
 # Build the API server package
 test_rails_package_presence arvados-api-server "$WORKSPACE/services/api"
 if [[ "$?" == "0" ]]; then
+  version_file="$(version_from_git)"
+  echo "$version_file" >"$WORKSPACE/services/api/package-build.version"
   handle_rails_package arvados-api-server "$WORKSPACE/services/api" \
       "$WORKSPACE/agpl-3.0.txt" --url="https://arvados.org" \
       --description="Arvados API server - Arvados is a free and open source platform for big data science." \
@@ -606,6 +608,8 @@ if [[ "$?" == "0" ]] ; then
     echo "ERROR: Asset precompilation failed"
     EXITCODE=1
   else
+    version_file="$(version_from_git)"
+    echo "$version_file" >"$WORKSPACE/apps/workbench/package-build.version"
     handle_rails_package arvados-workbench "$WORKSPACE/apps/workbench" \
         "$WORKSPACE/agpl-3.0.txt" --url="https://arvados.org" \
         --description="Arvados Workbench - Arvados is a free and open source platform for big data science." \

diff --git a/build/run-library.sh b/build/run-library.sh
index 92fdbea2b2079d97c2f69b71f83e1acc124530af..c5a73cbe35a6116fdbed0b8f364f2af4f0e83df5 100755 (executable)
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -336,7 +336,7 @@ handle_rails_package() {
         switches+=(--iteration $RAILS_PACKAGE_ITERATION)
     fi
     # For some reason fpm excludes need to not start with /.
-    #local exclude_root="${railsdir#/}"
+    local exclude_root="${railsdir#/}"
     # .git and packages are for the SSO server, which is built from its
     # repository root.
     local -a exclude_list=(.git packages tmp log coverage Capfile\* \