13667: test add PKG_VERSION in run-build-packages
authorFernando Monserrat <fernando.monserrat@gmail.com>
Wed, 11 Jul 2018 20:10:00 +0000 (17:10 -0300)
committerFernando Monserrat <fernando.monserrat@gmail.com>
Wed, 11 Jul 2018 20:10:00 +0000 (17:10 -0300)
Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat@veritasgenetics.com>

build/run-build-packages.sh

index 82f99923e036c79c70ac3379ad933b830ff2cefa..512770b01f54a8c511bd04fa55ba142c69fcd574 100755 (executable)
@@ -274,9 +274,9 @@ handle_python_package
       # go into detached-head state
       git checkout $DASHQ_UNLESS_DEBUG "$COMMIT_HASH"
       echo "$COMMIT_HASH" >git-commit.version
-
       cd "$SRC_BUILD_DIR"
       PKG_VERSION=$(version_from_git)
+      echo "$PKG_VERSION" >package-build.version
       cd $WORKSPACE/packages/$TARGET
       fpm_build $SRC_BUILD_DIR/=/usr/local/arvados/src arvados-src 'Curoverse, Inc.' 'dir' "$PKG_VERSION" "--exclude=usr/local/arvados/src/.git" "--url=https://arvados.org" "--license=GNU Affero General Public License, version 3.0" "--description=The Arvados source code" "--architecture=all"
 
@@ -569,8 +569,7 @@ if [[ "$?" == "0" ]]; then
   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." \
-      --license="GNU Affero General Public License, version 3.0" \
-      -n "package-build.version" --config-files="/var/www/arvados-api/current/"
+      --license="GNU Affero General Public License, version 3.0"
 fi
 
 # Build the workbench server package
@@ -610,9 +609,7 @@ if [[ "$?" == "0" ]] ; then
     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." \
-        --license="GNU Affero General Public License, version 3.0" \
-        -n "package-build.version" --config-files="/var/www/arvados-workbench/current/"
-
+        --license="GNU Affero General Public License, version 3.0"
   fi
 fi