projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '11014-hide-node-status'
[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 958067c91c67a84398889459aa41a2313d22793d..685ca5156466135856fddcc90535ae770c5c3952 100755
(executable)
--- a/
build/run-build-packages-one-target.sh
+++ b/
build/run-build-packages-one-target.sh
@@
-11,7
+11,7
@@
Syntax:
--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
- Run package install test script "test-packages-
$target
.sh"
+ Run package install test script "test-packages-
[target]
.sh"
--debug
Output debug information (default: false)
--only-build <package>
--debug
Output debug information (default: false)
--only-build <package>
@@
-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
@@
-98,7
+99,8
@@
if [[ -n "$test_packages" ]]; then
if [[ -n "$(find $WORKSPACE/packages/$TARGET -name '*.deb')" ]] ; then
(cd $WORKSPACE/packages/$TARGET
if [[ -n "$(find $WORKSPACE/packages/$TARGET -name '*.deb')" ]] ; then
(cd $WORKSPACE/packages/$TARGET
- dpkg-scanpackages . 2> >(grep -v 'warning' 1>&2) | gzip -c > Packages.gz
+ dpkg-scanpackages . 2> >(grep -v 'warning' 1>&2) | tee Packages | gzip -c > Packages.gz
+ apt-ftparchive -o APT::FTPArchive::Release::Origin=Arvados release . > Release
)
fi
)
fi
@@
-145,10
+147,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"
@@
-181,7
+179,7
@@
if [[ -n "$test_packages" ]]; then
echo "START: $p test on $IMAGE" >&2
if docker run --rm \
"${docker_volume_args[@]}" \
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
@@
-198,7
+196,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