projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 9998-no-count-items-available
[arvados.git]
/
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 16c7129d9b8efc0747da64f394366680f1ce4fc6..6a1ec9ca6d75b622abe37cb71b7773bd3efd60b6 100755
(executable)
--- a/
build/run-build-packages-one-target.sh
+++ b/
build/run-build-packages-one-target.sh
@@
-7,7
+7,7
@@
Syntax:
WORKSPACE=/path/to/arvados $(basename $0) [options]
--target <target>
WORKSPACE=/path/to/arvados $(basename $0) [options]
--target <target>
- Distribution to build packages for (default: debian
7
)
+ Distribution to build packages for (default: debian
8
)
--command
Build command to execute (default: use built-in Docker image command)
--test-packages
--command
Build command to execute (default: use built-in Docker image command)
--test-packages
@@
-48,7
+48,7
@@
if [ $? -ne 0 ]; then
exit 1
fi
exit 1
fi
-TARGET=debian
7
+TARGET=debian
8
COMMAND=
DEBUG=
COMMAND=
DEBUG=
@@
-72,6
+72,7
@@
while [ $# -gt 0 ]; do
;;
--debug)
DEBUG=" --debug"
;;
--debug)
DEBUG=" --debug"
+ ARVADOS_DEBUG="1"
;;
--command)
COMMAND="$2"; shift
;;
--command)
COMMAND="$2"; shift
@@
-145,10
+146,6
@@
if test -z "$packages" ; then
libarvados-perl"
case "$TARGET" in
libarvados-perl"
case "$TARGET" in
- centos6)
- packages="$packages python27-python-arvados-fuse
- python27-python-arvados-python-client python27-python-arvados-cwl-runner"
- ;;
*)
packages="$packages python-arvados-fuse
python-arvados-python-client python-arvados-cwl-runner"
*)
packages="$packages python-arvados-fuse
python-arvados-python-client python-arvados-cwl-runner"
@@
-174,11
+171,14
@@
docker_volume_args=(
if [[ -n "$test_packages" ]]; then
for p in $packages ; do
if [[ -n "$test_packages" ]]; then
for p in $packages ; do
+ if [[ -n "$ONLY_BUILD" ]] && [[ "$p" != "$ONLY_BUILD" ]]; then
+ continue
+ fi
echo
echo "START: $p test on $IMAGE" >&2
if docker run --rm \
"${docker_volume_args[@]}" \
echo
echo "START: $p test on $IMAGE" >&2
if docker run --rm \
"${docker_volume_args[@]}" \
- --env ARVADOS_DEBUG=
1
\
+ --env ARVADOS_DEBUG=
$ARVADOS_DEBUG
\
--env "TARGET=$TARGET" \
--env "WORKSPACE=/arvados" \
"$IMAGE" $COMMAND $p
--env "TARGET=$TARGET" \
--env "WORKSPACE=/arvados" \
"$IMAGE" $COMMAND $p
@@
-195,7
+195,7
@@
else
echo "START: build packages on $IMAGE" >&2
if docker run --rm \
"${docker_volume_args[@]}" \
echo "START: build packages on $IMAGE" >&2
if docker run --rm \
"${docker_volume_args[@]}" \
- --env ARVADOS_DEBUG=
1
\
+ --env ARVADOS_DEBUG=
$ARVADOS_DEBUG
\
--env "ONLY_BUILD=$ONLY_BUILD" \
"$IMAGE" $COMMAND
then
--env "ONLY_BUILD=$ONLY_BUILD" \
"$IMAGE" $COMMAND
then