projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
15954: Merge branch 'master'
[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 5c7dc342ee9c40b546ad38e377555193d6192975..f476a9691cfb70b8b21ca3fd6a2ae2dd2e051dc7 100755
(executable)
--- a/
build/run-build-packages-one-target.sh
+++ b/
build/run-build-packages-one-target.sh
@@
-10,7
+10,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
9
)
+ Distribution to build packages for (default: debian
10
)
--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
@@
-21,6
+21,9
@@
Syntax:
Build only a specific package
--only-test <package>
Test only a specific package
Build only a specific package
--only-test <package>
Test only a specific package
+--force-build
+ Build even if the package exists upstream or if it has already been
+ built locally
--force-test
Test even if there is no new untested package
--build-version <string>
--force-test
Test even if there is no new untested package
--build-version <string>
@@
-51,13
+54,14
@@
if ! [[ -d "$WORKSPACE" ]]; then
fi
PARSEDOPTS=$(getopt --name "$0" --longoptions \
fi
PARSEDOPTS=$(getopt --name "$0" --longoptions \
- help,debug,test-packages,target:,command:,only-test:,force-test,only-build:,build-version: \
+ help,debug,test-packages,target:,command:,only-test:,force-test,only-build:,
force-build,
build-version: \
-- "" "$@")
if [ $? -ne 0 ]; then
exit 1
fi
-- "" "$@")
if [ $? -ne 0 ]; then
exit 1
fi
-TARGET=debian9
+TARGET=debian10
+FORCE_BUILD=0
COMMAND=
DEBUG=
COMMAND=
DEBUG=
@@
-80,6
+84,9
@@
while [ $# -gt 0 ]; do
--force-test)
FORCE_TEST=true
;;
--force-test)
FORCE_TEST=true
;;
+ --force-build)
+ FORCE_BUILD=1
+ ;;
--only-build)
ONLY_BUILD="$2"; shift
;;
--only-build)
ONLY_BUILD="$2"; shift
;;
@@
-261,7
+268,6
@@
else
set +e
mv -f ${WORKSPACE}/packages/${TARGET}/* ${WORKSPACE}/packages/${TARGET}/processed/ 2>/dev/null
set -e
set +e
mv -f ${WORKSPACE}/packages/${TARGET}/* ${WORKSPACE}/packages/${TARGET}/processed/ 2>/dev/null
set -e
-set -x
# Build packages.
if docker run \
--rm \
# Build packages.
if docker run \
--rm \
@@
-270,6
+276,7
@@
set -x
--env ARVADOS_BUILDING_ITERATION="$ARVADOS_BUILDING_ITERATION" \
--env ARVADOS_DEBUG=$ARVADOS_DEBUG \
--env "ONLY_BUILD=$ONLY_BUILD" \
--env ARVADOS_BUILDING_ITERATION="$ARVADOS_BUILDING_ITERATION" \
--env ARVADOS_DEBUG=$ARVADOS_DEBUG \
--env "ONLY_BUILD=$ONLY_BUILD" \
+ --env "FORCE_BUILD=$FORCE_BUILD" \
"$IMAGE" $COMMAND
then
echo
"$IMAGE" $COMMAND
then
echo