[ARVADOS-DEV] created: 3f03b72f0c24ee2c5abfe5654107f6e1c019bc15
git at public.curoverse.com
git at public.curoverse.com
Thu Aug 13 16:06:38 EDT 2015
at 3f03b72f0c24ee2c5abfe5654107f6e1c019bc15 (commit)
commit 3f03b72f0c24ee2c5abfe5654107f6e1c019bc15
Author: Tom Clegg <tom at curoverse.com>
Date: Wed Aug 12 16:10:17 2015 -0400
6638: Fix rvm usage error. Straighten out "need new gem" and "need to build new package from gem" logic.
diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 3893d32..60d7ab6 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -233,20 +233,18 @@ handle_python_package () {
handle_ruby_gem() {
local gem_name=$1; shift
local gem_version=$(nohash_version_from_git)
+ local gem_src_dir="$(pwd)"
- if [ -e "${gem_name}-${gem_version}.gem" ]; then
- # This gem doesn't need rebuilding.
- return
- fi
-
- find -maxdepth 1 -name "${gem_name}-*.gem" -delete
+ if ! [[ -e "${gem_name}-${gem_version}.gem" ]]; then
+ find -maxdepth 1 -name "${gem_name}-*.gem" -delete
- # -q appears to be broken in gem version 2.2.2
- gem build "$gem_name.gemspec" $DASHQ_UNLESS_DEBUG >"$STDOUT_IF_DEBUG" 2>"$STDERR_IF_DEBUG"
+ # -q appears to be broken in gem version 2.2.2
+ $GEM build "$gem_name.gemspec" $DASHQ_UNLESS_DEBUG >"$STDOUT_IF_DEBUG" 2>"$STDERR_IF_DEBUG"
+ fi
- fpm_build "$gem_name"-*.gem "" "Curoverse, Inc." gem "" \
+ cd "$WORKSPACE/packages/$TARGET"
+ fpm_build "$gem_src_dir/$gem_name"-*.gem "" "Curoverse, Inc." gem "" \
--prefix "$FPM_GEM_PREFIX"
- mv -t "$WORKSPACE/packages/$TARGET/" "$gem_name"*."$FORMAT"
}
# Build packages for everything
@@ -368,7 +366,10 @@ fpm_verify () {
}
if [[ -f /etc/profile.d/rvm.sh ]]; then
- source /etc/profile.d/rvm.sh
+ source /etc/profile.d/rvm.sh
+ GEM="rvm-exec default gem"
+else
+ GEM=gem
fi
# Make all files world-readable -- jenkins runs with umask 027, and has checked
@@ -409,11 +410,7 @@ perl Makefile.PL INSTALL_BASE=install >"$STDOUT_IF_DEBUG" && \
# Ruby gems
debug_echo -e "\nRuby gems\n"
-if type rvm-exec >/dev/null 2>&1; then
- FPM_GEM_PREFIX=$(rvm-exec system gem environment gemdir)
-else
- FPM_GEM_PREFIX=$(gem environment gemdir)
-fi
+FPM_GEM_PREFIX=$($GEM environment gemdir)
cd "$WORKSPACE/sdk/ruby"
handle_ruby_gem arvados
commit 59c684f9e8a545ffae5036b193d09e9c8ab7e689
Author: Tom Clegg <tom at curoverse.com>
Date: Wed Aug 12 16:09:08 2015 -0400
6638: Add postgres libraries to build containers, so bundler can build the pg gem.
diff --git a/jenkins/dockerfiles/centos6/Dockerfile b/jenkins/dockerfiles/centos6/Dockerfile
index e08665b..ca974df 100644
--- a/jenkins/dockerfiles/centos6/Dockerfile
+++ b/jenkins/dockerfiles/centos6/Dockerfile
@@ -2,7 +2,7 @@ FROM centos:6
MAINTAINER Brett Smith <brett at curoverse.com>
# Install build dependencies provided in base distribution
-RUN yum -q -y install make automake gcc gcc-c++ libyaml-devel patch readline-devel zlib-devel libffi-devel openssl-devel bzip2 libtool bison sqlite-devel rpm-build git perl-ExtUtils-MakeMaker fuse-devel libattr-devel nss-devel libcurl-devel which tar scl-utils
+RUN yum -q -y install make automake gcc gcc-c++ libyaml-devel patch readline-devel zlib-devel libffi-devel openssl-devel bzip2 libtool bison sqlite-devel rpm-build git perl-ExtUtils-MakeMaker fuse-devel libattr-devel nss-devel libcurl-devel which tar scl-utils postgresql-devel
# Install golang binary
ADD generated/golang-amd64.tar.gz /usr/local/
diff --git a/jenkins/dockerfiles/debian7/Dockerfile b/jenkins/dockerfiles/debian7/Dockerfile
index ca4cc28..33083a0 100644
--- a/jenkins/dockerfiles/debian7/Dockerfile
+++ b/jenkins/dockerfiles/debian7/Dockerfile
@@ -2,7 +2,7 @@ FROM debian:wheezy
MAINTAINER Ward Vandewege <ward at curoverse.com>
# Install dependencies and set up system.
-RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev curl git procps libattr1-dev libfuse-dev
+RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev curl git procps libattr1-dev libfuse-dev libpq-dev
# Install RVM
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
diff --git a/jenkins/dockerfiles/debian8/Dockerfile b/jenkins/dockerfiles/debian8/Dockerfile
index 5b81434..dc26e25 100644
--- a/jenkins/dockerfiles/debian8/Dockerfile
+++ b/jenkins/dockerfiles/debian8/Dockerfile
@@ -2,7 +2,7 @@ FROM debian:jessie
MAINTAINER Ward Vandewege <ward at curoverse.com>
# Install dependencies and set up system.
-RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev curl git procps libattr1-dev libfuse-dev libgnutls28-dev
+RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev curl git procps libattr1-dev libfuse-dev libgnutls28-dev libpq-dev
# Install RVM
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
diff --git a/jenkins/dockerfiles/ubuntu1204/Dockerfile b/jenkins/dockerfiles/ubuntu1204/Dockerfile
index 96e331c..642d2a0 100644
--- a/jenkins/dockerfiles/ubuntu1204/Dockerfile
+++ b/jenkins/dockerfiles/ubuntu1204/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:precise
MAINTAINER Ward Vandewege <ward at curoverse.com>
# Install dependencies and set up system.
-RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev curl git libattr1-dev libfuse-dev
+RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev curl git libattr1-dev libfuse-dev libpq-dev
# Install RVM
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
diff --git a/jenkins/dockerfiles/ubuntu1404/Dockerfile b/jenkins/dockerfiles/ubuntu1404/Dockerfile
index 4b56bce..69ed2cc 100644
--- a/jenkins/dockerfiles/ubuntu1404/Dockerfile
+++ b/jenkins/dockerfiles/ubuntu1404/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:trusty
MAINTAINER Brett Smith <brett at curoverse.com>
# Install dependencies and set up system.
-RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev curl git libattr1-dev libfuse-dev
+RUN /usr/bin/apt-get update && /usr/bin/apt-get install -q -y python2.7-dev python3 python-setuptools python3-setuptools libcurl4-gnutls-dev curl git libattr1-dev libfuse-dev libpq-dev
# Install RVM
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
commit bf4baab1c1e2a422334fc07d77a44036832583a9
Author: Tom Clegg <tom at curoverse.com>
Date: Wed Aug 12 12:01:29 2015 -0400
6638: Build current version of arvados-src, not github master.
diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 0bd0a43..3893d32 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -436,37 +436,25 @@ handle_python_package
cd "$WORKSPACE/services/nodemanager"
handle_python_package
-# Arvados-src
-# We use $WORKSPACE/src-build-dir as the clean directory from which to build the src package
-if [[ ! -d "$WORKSPACE/src-build-dir" ]]; then
- mkdir "$WORKSPACE/src-build-dir"
- cd "$WORKSPACE"
- git clone $DASHQ_UNLESS_DEBUG https://github.com/curoverse/arvados.git src-build-dir
-fi
+# arvados-src
+(
+ set -e
-# Get the commit hash we're building against, from the working directory
-cd "$WORKSPACE"
-MASTER_COMMIT_HASH=$(format_last_commit_here "%H")
-
-# Make sure we check out that commit in the clean $WORKSPACE/src-build-dir directory
-cd "$WORKSPACE/src-build-dir"
-# just in case, check out master
-git checkout $DASHQ_UNLESS_DEBUG master
-git pull $DASHQ_UNLESS_DEBUG
-# go into detached-head state
-MASTER_COMMIT_HASH=$(format_last_commit_here "%H")
-git checkout $DASHQ_UNLESS_DEBUG "$MASTER_COMMIT_HASH"
-echo "$MASTER_COMMIT_HASH" >git-commit.version
-
-# Build arvados src deb package
-cd "$WORKSPACE"
-PKG_VERSION=$(version_from_git)
-cd $WORKSPACE/packages/$TARGET
-fpm_build $WORKSPACE/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"
+ cd "$WORKSPACE"
+ COMMIT_HASH=$(format_last_commit_here "%H")
+
+ SRC_BUILD_DIR=$(mktemp -d)
+ git clone $DASHQ_UNLESS_DEBUG --branch "$COMMIT_HASH" "$WORKSPACE/.git" "$SRC_BUILD_DIR"
+ cd "$SRC_BUILD_DIR"
+ echo "$COMMIT_HASH" >git-commit.version
+
+ cd "$SRC_BUILD_DIR"
+ PKG_VERSION=$(version_from_git)
+ 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"
-# clean up, check out master and step away from detached-head state
-cd "$WORKSPACE/src-build-dir"
-git checkout $DASHQ_UNLESS_DEBUG master
+ rm -r "$SRC_BUILD_DIR"
+)
# Keep
export GOPATH=$(mktemp -d)
commit dfc5f78444e593f24ab976a6ad472c2d1dce12b9
Author: Tom Clegg <tom at curoverse.com>
Date: Wed Aug 12 12:05:59 2015 -0400
6638: Read package dependencies from fpm-info.sh in source tree.
diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 16699ba..0bd0a43 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -314,6 +314,25 @@ fpm_build () {
COMMAND_ARR+=("$i")
done
+ # Append --depends X and other arguments specified by fpm-info.sh in
+ # the package source dir. These are added last so they can override
+ # the arguments added by this script.
+ declare -a fpm_args=()
+ declare -a fpm_depends=()
+ if [[ -d "$PACKAGE" ]]; then
+ FPM_INFO="$PACKAGE/fpm-info.sh"
+ else
+ FPM_INFO="${WORKSPACE}/backports/${PACKAGE_TYPE}-${PACKAGE}/fpm-info.sh"
+ fi
+ if [[ -e "$FPM_INFO" ]]; then
+ debug_echo "Loading fpm overrides from $FPM_INFO"
+ source "$FPM_INFO"
+ fi
+ for i in "${fpm_depends[@]}"; do
+ COMMAND_ARR+=('--depends' "$i")
+ done
+ COMMAND_ARR+=("${fpm_args[@]}")
+
COMMAND_ARR+=("$PACKAGE")
debug_echo -e "\n${COMMAND_ARR[@]}\n"
commit 988b1304d57f960f1006af52dc700026061a280e
Author: Tom Clegg <tom at curoverse.com>
Date: Wed Aug 12 09:31:32 2015 -0400
6638: Dry up debug printfs.
diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 58c63ac..16699ba 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -59,6 +59,19 @@ while [ $# -gt 0 ]; do
shift
done
+STDOUT_IF_DEBUG=/dev/null
+STDERR_IF_DEBUG=/dev/null
+DASHQ_UNLESS_DEBUG=-q
+if [[ "$DEBUG" != 0 ]]; then
+ STDOUT_IF_DEBUG=/dev/stdout
+ STDERR_IF_DEBUG=/dev/stderr
+ DASHQ_UNLESS_DEBUG=
+fi
+
+debug_echo () {
+ echo "$@" >"$STDOUT_IF_DEBUG"
+}
+
declare -a PYTHON_BACKPORTS PYTHON3_BACKPORTS
PYTHON2_VERSION=2.7
@@ -183,10 +196,8 @@ if [ -z "$RUN_BUILD_PACKAGES_PATH" ] ; then
exit 1 # fail
fi
-if [[ "$DEBUG" != 0 ]]; then
- echo "$0 is running from $RUN_BUILD_PACKAGES_PATH"
- echo "Workspace is $WORKSPACE"
-fi
+debug_echo "$0 is running from $RUN_BUILD_PACKAGES_PATH"
+debug_echo "Workspace is $WORKSPACE"
format_last_commit_here() {
local format=$1; shift
@@ -216,11 +227,7 @@ handle_python_package () {
return
fi
# Make sure only to use sdist - that's the only format pip can deal with (sigh)
- if [[ "$DEBUG" != 0 ]]; then
- python setup.py sdist
- else
- python setup.py -q sdist
- fi
+ python setup.py $DASHQ_UNLESS_DEBUG sdist
}
handle_ruby_gem() {
@@ -234,12 +241,8 @@ handle_ruby_gem() {
find -maxdepth 1 -name "${gem_name}-*.gem" -delete
- if [[ "$DEBUG" != 0 ]]; then
- gem build "$gem_name.gemspec"
- else
- # -q appears to be broken in gem version 2.2.2
- gem build "$gem_name.gemspec" -q >/dev/null 2>&1
- fi
+ # -q appears to be broken in gem version 2.2.2
+ gem build "$gem_name.gemspec" $DASHQ_UNLESS_DEBUG >"$STDOUT_IF_DEBUG" 2>"$STDERR_IF_DEBUG"
fpm_build "$gem_name"-*.gem "" "Curoverse, Inc." gem "" \
--prefix "$FPM_GEM_PREFIX"
@@ -313,11 +316,7 @@ fpm_build () {
COMMAND_ARR+=("$PACKAGE")
- if [[ "$DEBUG" != 0 ]]; then
- echo
- echo "${COMMAND_ARR[@]}"
- echo
- fi
+ debug_echo -e "\n${COMMAND_ARR[@]}\n"
FPM_RESULTS=$("${COMMAND_ARR[@]}")
FPM_EXIT_CODE=$?
@@ -364,46 +363,32 @@ find -type d -name 'bin' |xargs -I {} find {} -type f |xargs -I {} chmod 755 {}
# gems and packages
umask 0022
-if [[ "$DEBUG" != 0 ]]; then
- echo "umask is" `umask`
-fi
+debug_echo "umask is" `umask`
if [[ ! -d "$WORKSPACE/packages/$TARGET" ]]; then
mkdir -p $WORKSPACE/packages/$TARGET
fi
# Perl packages
-if [[ "$DEBUG" != 0 ]]; then
- echo -e "\nPerl packages\n"
-fi
-
-if [[ "$DEBUG" != 0 ]]; then
- PERL_OUT=/dev/stdout
-else
- PERL_OUT=/dev/null
-fi
+debug_echo -e "\nPerl packages\n"
cd "$WORKSPACE/sdk/perl"
if [[ -e Makefile ]]; then
- make realclean >"$PERL_OUT"
+ make realclean >"$STDOUT_IF_DEBUG"
fi
find -maxdepth 1 \( -name 'MANIFEST*' -or -name "libarvados-perl*.$FORMAT" \) \
-delete
rm -rf install
-perl Makefile.PL INSTALL_BASE=install >"$PERL_OUT" && \
- make install INSTALLDIRS=perl >"$PERL_OUT" && \
+perl Makefile.PL INSTALL_BASE=install >"$STDOUT_IF_DEBUG" && \
+ make install INSTALLDIRS=perl >"$STDOUT_IF_DEBUG" && \
fpm_build install/lib/=/usr/share libarvados-perl \
"Curoverse, Inc." dir "$(version_from_git)" install/man/=/usr/share/man && \
mv libarvados-perl*.$FORMAT "$WORKSPACE/packages/$TARGET/"
# Ruby gems
-if [[ "$DEBUG" != 0 ]]; then
- echo
- echo "Ruby gems"
- echo
-fi
+debug_echo -e "\nRuby gems\n"
if type rvm-exec >/dev/null 2>&1; then
FPM_GEM_PREFIX=$(rvm-exec system gem environment gemdir)
@@ -418,11 +403,7 @@ cd "$WORKSPACE/sdk/cli"
handle_ruby_gem arvados-cli
# Python packages
-if [[ "$DEBUG" != 0 ]]; then
- echo
- echo "Python packages"
- echo
-fi
+debug_echo -e "\nPython packages\n"
cd "$WORKSPACE/sdk/pam"
handle_python_package
@@ -441,11 +422,7 @@ handle_python_package
if [[ ! -d "$WORKSPACE/src-build-dir" ]]; then
mkdir "$WORKSPACE/src-build-dir"
cd "$WORKSPACE"
- if [[ "$DEBUG" != 0 ]]; then
- git clone https://github.com/curoverse/arvados.git src-build-dir
- else
- git clone -q https://github.com/curoverse/arvados.git src-build-dir
- fi
+ git clone $DASHQ_UNLESS_DEBUG https://github.com/curoverse/arvados.git src-build-dir
fi
# Get the commit hash we're building against, from the working directory
@@ -455,17 +432,11 @@ MASTER_COMMIT_HASH=$(format_last_commit_here "%H")
# Make sure we check out that commit in the clean $WORKSPACE/src-build-dir directory
cd "$WORKSPACE/src-build-dir"
# just in case, check out master
-if [[ "$DEBUG" != 0 ]]; then
- git checkout master
- git pull
- # go into detached-head state
- git checkout "$MASTER_COMMIT_HASH"
-else
- git checkout -q master
- git pull -q
- # go into detached-head state
- git checkout -q "$MASTER_COMMIT_HASH"
-fi
+git checkout $DASHQ_UNLESS_DEBUG master
+git pull $DASHQ_UNLESS_DEBUG
+# go into detached-head state
+MASTER_COMMIT_HASH=$(format_last_commit_here "%H")
+git checkout $DASHQ_UNLESS_DEBUG "$MASTER_COMMIT_HASH"
echo "$MASTER_COMMIT_HASH" >git-commit.version
# Build arvados src deb package
@@ -476,11 +447,7 @@ fpm_build $WORKSPACE/src-build-dir/=/usr/local/arvados/src arvados-src 'Curovers
# clean up, check out master and step away from detached-head state
cd "$WORKSPACE/src-build-dir"
-if [[ "$DEBUG" != 0 ]]; then
- git checkout master
-else
- git checkout -q master
-fi
+git checkout $DASHQ_UNLESS_DEBUG master
# Keep
export GOPATH=$(mktemp -d)
@@ -610,11 +577,8 @@ if [[ ! -d "$WORKSPACE/services/api/tmp" ]]; then
mkdir $WORKSPACE/services/api/tmp
fi
-BUNDLE_OUTPUT=`bundle install --path vendor/bundle`
-if [[ "$DEBUG" != 0 ]]; then
- echo $BUNDLE_OUTPUT
-fi
+bundle install --path vendor/bundle >"$STDOUT_IF_DEBUG"
/usr/bin/git rev-parse HEAD > git-commit.version
@@ -631,11 +595,7 @@ cd $WORKSPACE/packages/$TARGET
if [[ "$BUILD_BUNDLE_PACKAGES" != 0 ]]; then
declare -a COMMAND_ARR=("fpm" "--maintainer=Ward Vandewege <ward at curoverse.com>" "--vendor='Curoverse, Inc.'" "--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'" "-s" "dir" "-t" "$FORMAT" "-n" "${PACKAGE_NAME}-with-bundle" "-v" "$API_VERSION" "-x" "var/www/arvados-api/current/tmp" "-x" "var/www/arvados-api/current/log" "-x" "var/www/arvados-api/current/vendor/cache/*" "-x" "var/www/arvados-api/current/coverage" "-x" "var/www/arvados-api/current/Capfile*" "-x" "var/www/arvados-api/current/config/deploy*" "--after-install=$RUN_BUILD_PACKAGES_PATH/arvados-api-server-extras/postinst.sh" "$WORKSPACE/services/api/=/var/www/arvados-api/current" "$RUN_BUILD_PACKAGES_PATH/arvados-api-server-extras/arvados-api-server-upgrade.sh=/usr/local/bin/arvados-api-server-upgrade.sh")
- if [[ "$DEBUG" != 0 ]]; then
- echo
- echo "${COMMAND_ARR[@]}"
- echo
- fi
+ debug_echo -e "\n${COMMAND_ARR[@]}\n"
FPM_RESULTS=$("${COMMAND_ARR[@]}")
FPM_EXIT_CODE=$?
@@ -645,11 +605,7 @@ fi
# Build the 'bare' package without vendor/bundle.
declare -a COMMAND_ARR=("fpm" "--maintainer=Ward Vandewege <ward at curoverse.com>" "--vendor='Curoverse, Inc.'" "--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'" "-s" "dir" "-t" "$FORMAT" "-n" "${PACKAGE_NAME}" "-v" "$API_VERSION" "-x" "var/www/arvados-api/current/tmp" "-x" "var/www/arvados-api/current/log" "-x" "var/www/arvados-api/current/vendor/bundle" "-x" "var/www/arvados-api/current/vendor/cache/*" "-x" "var/www/arvados-api/current/coverage" "-x" "var/www/arvados-api/current/Capfile*" "-x" "var/www/arvados-api/current/config/deploy*" "--after-install=$RUN_BUILD_PACKAGES_PATH/arvados-api-server-extras/postinst.sh" "$WORKSPACE/services/api/=/var/www/arvados-api/current" "$RUN_BUILD_PACKAGES_PATH/arvados-api-server-extras/arvados-api-server-upgrade.sh=/usr/local/bin/arvados-api-server-upgrade.sh")
-if [[ "$DEBUG" != 0 ]]; then
- echo
- echo "${COMMAND_ARR[@]}"
- echo
-fi
+debug_echo -e "\n${COMMAND_ARR[@]}\n"
FPM_RESULTS=$("${COMMAND_ARR[@]}")
FPM_EXIT_CODE=$?
@@ -668,11 +624,7 @@ if [[ ! -d "$WORKSPACE/apps/workbench/tmp" ]]; then
mkdir $WORKSPACE/apps/workbench/tmp
fi
-BUNDLE_OUTPUT=`bundle install --path vendor/bundle`
-
-if [[ "$DEBUG" != 0 ]]; then
- echo $BUNDLE_OUTPUT
-fi
+bundle install --path vendor/bundle >"$STDOUT_IF_DEBUG"
/usr/bin/git rev-parse HEAD > git-commit.version
@@ -701,11 +653,7 @@ if [[ "$BUILD_BUNDLE_PACKAGES" != 0 ]]; then
declare -a COMMAND_ARR=("fpm" "--maintainer=Ward Vandewege <ward at curoverse.com>" "--vendor='Curoverse, Inc.'" "--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'" "-s" "dir" "-t" "$FORMAT" "-n" "${PACKAGE_NAME}-with-bundle" "-v" "$WORKBENCH_VERSION" "-x" "var/www/arvados-workbench/current/log" "-x" "var/www/arvados-workbench/current/vendor/cache/*" "-x" "var/www/arvados-workbench/current/coverage" "-x" "var/www/arvados-workbench/current/Capfile*" "-x" "var/www/arvados-workbench/current/config/deploy*" "--after-install=$RUN_BUILD_PACKAGES_PATH/arvados-workbench-extras/postinst.sh" "$WORKSPACE/apps/workbench/=/var/www/arvados-workbench/current" "$RUN_BUILD_PACKAGES_PATH/arvados-workbench-extras/arvados-workbench-upgrade.sh=/usr/local/bin/arvados-workbench-upgrade.sh")
- if [[ "$DEBUG" != 0 ]]; then
- echo
- echo "${COMMAND_ARR[@]}"
- echo
- fi
+ debug_echo -e "\n${COMMAND_ARR[@]}\n"
FPM_RESULTS=$("${COMMAND_ARR[@]}")
FPM_EXIT_CODE=$?
@@ -716,11 +664,7 @@ fi
declare -a COMMAND_ARR=("fpm" "--maintainer=Ward Vandewege <ward at curoverse.com>" "--vendor='Curoverse, Inc.'" "--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'" "-s" "dir" "-t" "$FORMAT" "-n" "${PACKAGE_NAME}" "-v" "$WORKBENCH_VERSION" "-x" "var/www/arvados-workbench/current/log" "-x" "var/www/arvados-workbench/current/vendor/bundle" "-x" "var/www/arvados-workbench/current/vendor/cache/*" "-x" "var/www/arvados-workbench/current/coverage" "-x" "var/www/arvados-workbench/current/Capfile*" "-x" "var/www/arvados-workbench/current/config/deploy*" "--after-install=$RUN_BUILD_PACKAGES_PATH/arvados-workbench-extras/postinst.sh" "$WORKSPACE/apps/workbench/=/var/www/arvados-workbench/current" "$RUN_BUILD_PACKAGES_PATH/arvados-workbench-extras/arvados-workbench-upgrade.sh=/usr/local/bin/arvados-workbench-upgrade.sh")
-if [[ "$DEBUG" != 0 ]]; then
- echo
- echo "${COMMAND_ARR[@]}"
- echo
-fi
+debug_echo -e "\n${COMMAND_ARR[@]}\n"
FPM_RESULTS=$("${COMMAND_ARR[@]}")
FPM_EXIT_CODE=$?
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list