[ARVADOS] updated: dfd9492ee371ce86f7b4543106eb5060bc98928c
Git user
git at public.curoverse.com
Tue Nov 29 09:38:46 EST 2016
Summary of changes:
build/run-build-packages-one-target.sh | 11 +++++++++--
build/run-build-packages.sh | 18 ++++++++++++++++--
build/run-library.sh | 17 +++++++++++++++++
3 files changed, 42 insertions(+), 4 deletions(-)
via dfd9492ee371ce86f7b4543106eb5060bc98928c (commit)
via dcc80dc5b02e46170400d42ca72672cceff03ba2 (commit)
from 7bf6588ce6589a194df2c7f45b9a443025c2ff67 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit dfd9492ee371ce86f7b4543106eb5060bc98928c
Merge: 7bf6588 dcc80dc
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Tue Nov 29 09:38:41 2016 -0500
Merge branch '10599-run-build-packages' closes #10599
commit dcc80dc5b02e46170400d42ca72672cceff03ba2
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Wed Nov 23 13:58:37 2016 -0500
10599: Add run-build-packages-one-target.sh --only-build, run-build-packages looks for $ONLY_BUILD in its environment.
diff --git a/build/run-build-packages-one-target.sh b/build/run-build-packages-one-target.sh
index adcb87f..60250c9 100755
--- a/build/run-build-packages-one-target.sh
+++ b/build/run-build-packages-one-target.sh
@@ -14,7 +14,9 @@ Syntax:
Run package install test script "test-packages-$target.sh"
--debug
Output debug information (default: false)
---only-test
+--only-build <package>
+ Build only a specific package
+--only-test <package>
Test only a specific package
WORKSPACE=path Path to the Arvados source tree to build packages from
@@ -40,7 +42,7 @@ if ! [[ -d "$WORKSPACE" ]]; then
fi
PARSEDOPTS=$(getopt --name "$0" --longoptions \
- help,debug,test-packages,target:,command:,only-test: \
+ help,debug,test-packages,target:,command:,only-test:,only-build: \
-- "" "$@")
if [ $? -ne 0 ]; then
exit 1
@@ -62,8 +64,12 @@ while [ $# -gt 0 ]; do
TARGET="$2"; shift
;;
--only-test)
+ test_packages=1
packages="$2"; shift
;;
+ --only-build)
+ ONLY_BUILD="$2"; shift
+ ;;
--debug)
DEBUG=" --debug"
;;
@@ -191,6 +197,7 @@ else
if docker run --rm \
"${docker_volume_args[@]}" \
--env ARVADOS_DEBUG=1 \
+ --env "ONLY_BUILD=$ONLY_BUILD" \
"$IMAGE" $COMMAND
then
echo
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index de2def7..7da70e7 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -15,8 +15,10 @@ Options:
Build api server and workbench packages with vendor/bundle included
--debug
Output debug information (default: false)
---target
+--target <target>
Distribution to build packages for (default: debian7)
+--only-build <package>
+ Build only a specific package (or $ONLY_BUILD from environment)
--command
Build command to execute (defaults to the run command defined in the
Docker image)
@@ -31,7 +33,7 @@ TARGET=debian7
COMMAND=
PARSEDOPTS=$(getopt --name "$0" --longoptions \
- help,build-bundle-packages,debug,target: \
+ help,build-bundle-packages,debug,target:,only-build: \
-- "" "$@")
if [ $? -ne 0 ]; then
exit 1
@@ -48,6 +50,9 @@ while [ $# -gt 0 ]; do
--target)
TARGET="$2"; shift
;;
+ --only-build)
+ ONLY_BUILD="$2"; shift
+ ;;
--debug)
DEBUG=1
;;
@@ -248,6 +253,7 @@ fi
# Perl packages
debug_echo -e "\nPerl packages\n"
+if [[ -z "$ONLY_BUILD" ]] || [[ "libarvados-perl" = "$ONLY_BUILD" ]] ; then
cd "$WORKSPACE/sdk/perl"
if [[ -e Makefile ]]; then
@@ -263,6 +269,7 @@ perl Makefile.PL INSTALL_BASE=install >"$STDOUT_IF_DEBUG" && \
"Curoverse, Inc." dir "$(version_from_git)" install/man/=/usr/share/man \
"$WORKSPACE/LICENSE-2.0.txt=/usr/share/doc/libarvados-perl/LICENSE-2.0.txt" && \
mv --no-clobber libarvados-perl*.$FORMAT "$WORKSPACE/packages/$TARGET/"
+fi
# Ruby gems
debug_echo -e "\nRuby gems\n"
@@ -539,6 +546,11 @@ esac
for deppkg in "${PYTHON_BACKPORTS[@]}"; do
outname=$(echo "$deppkg" | sed -e 's/^python-//' -e 's/[<=>].*//' -e 's/_/-/g' -e "s/^/${PYTHON2_PKG_PREFIX}-/")
+
+ if [[ -n "$ONLY_BUILD" ]] && [[ "$outname" != "$ONLY_BUILD" ]] ; then
+ continue
+ fi
+
case "$deppkg" in
httplib2|google-api-python-client)
# Work around 0640 permissions on some package files.
@@ -588,6 +600,7 @@ handle_rails_package arvados-api-server "$WORKSPACE/services/api" \
--license="GNU Affero General Public License, version 3.0"
# Build the workbench server package
+if [[ -z "$ONLY_BUILD" ]] || [[ "arvados-workbench" = "$ONLY_BUILD" ]] ; then
(
set -e
cd "$WORKSPACE/apps/workbench"
@@ -612,6 +625,7 @@ handle_rails_package arvados-api-server "$WORKSPACE/services/api" \
# Remove generated configuration files so they don't go in the package.
rm config/application.yml config/environments/production.rb
)
+fi
if [[ "$?" != "0" ]]; then
echo "ERROR: Asset precompilation failed"
diff --git a/build/run-library.sh b/build/run-library.sh
index f0b120f..541e684 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -69,6 +69,10 @@ handle_ruby_gem() {
local gem_version="$(nohash_version_from_git)"
local gem_src_dir="$(pwd)"
+ if [[ -n "$ONLY_BUILD" ]] && [[ "$gem_name" != "$ONLY_BUILD" ]] ; then
+ return 0
+ fi
+
if ! [[ -e "${gem_name}-${gem_version}.gem" ]]; then
find -maxdepth 1 -name "${gem_name}-*.gem" -delete
@@ -84,6 +88,10 @@ package_go_binary() {
local description="$1"; shift
local license_file="${1:-agpl-3.0.txt}"; shift
+ if [[ -n "$ONLY_BUILD" ]] && [[ "$prog" != "$ONLY_BUILD" ]] ; then
+ return 0
+ fi
+
debug_echo "package_go_binary $src_path as $prog"
local basename="${src_path##*/}"
@@ -143,6 +151,11 @@ _build_rails_package_scripts() {
handle_rails_package() {
local pkgname="$1"; shift
+
+ if [[ -n "$ONLY_BUILD" ]] && [[ "$pkgname" != "$ONLY_BUILD" ]] ; then
+ return 0
+ fi
+
local srcdir="$1"; shift
local license_path="$1"; shift
local scripts_dir="$(mktemp --tmpdir -d "$pkgname-XXXXXXXX.scripts")" && \
@@ -208,6 +221,10 @@ fpm_build () {
VERSION=$1
shift
+ if [[ -n "$ONLY_BUILD" ]] && [[ "$PACKAGE_NAME" != "$ONLY_BUILD" ]] && [[ "$PACKAGE" != "$ONLY_BUILD" ]] ; then
+ return 0
+ fi
+
local default_iteration_value="$(default_iteration "$PACKAGE" "$VERSION")"
case "$PACKAGE_TYPE" in
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list