projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
17417: add native arm64 build support to our package build images. Add
[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 72f814836b3ce36b1a56f0c2221c9d9b50b8c485..f208963832444144a3bad57b502f53245be50359 100755
(executable)
--- a/
build/run-build-packages-one-target.sh
+++ b/
build/run-build-packages-one-target.sh
@@
-21,6
+21,8
@@
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
+--arch <arch>
+ Build a specific architecture (amd64 or arm64, defaults to native architecture)
--force-build
Build even if the package exists upstream or if it has already been
built locally
--force-build
Build even if the package exists upstream or if it has already been
built locally
@@
-54,13
+56,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:,force-build,build-version: \
+ help,debug,test-packages,target:,command:,only-test:,force-test,only-build:,force-build,
arch:,
build-version: \
-- "" "$@")
if [ $? -ne 0 ]; then
exit 1
fi
TARGET=debian10
-- "" "$@")
if [ $? -ne 0 ]; then
exit 1
fi
TARGET=debian10
+ARCH=
FORCE_BUILD=0
COMMAND=
DEBUG=
FORCE_BUILD=0
COMMAND=
DEBUG=
@@
-90,6
+93,9
@@
while [ $# -gt 0 ]; do
--only-build)
ONLY_BUILD="$2"; shift
;;
--only-build)
ONLY_BUILD="$2"; shift
;;
+ --arch)
+ ARCH="$2"; shift
+ ;;
--debug)
DEBUG=" --debug"
ARVADOS_DEBUG="1"
--debug)
DEBUG=" --debug"
ARVADOS_DEBUG="1"
@@
-106,7
+112,11
@@
while [ $# -gt 0 ]; do
elif ! [[ "$2" =~ (.*)-(.*) ]]; then
echo >&2 "FATAL: --build-version '$2' does not include an iteration. Try '${2}-1'?"
exit 1
elif ! [[ "$2" =~ (.*)-(.*) ]]; then
echo >&2 "FATAL: --build-version '$2' does not include an iteration. Try '${2}-1'?"
exit 1
+ elif ! [[ "$2" =~ ^[0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+|)(~rc[0-9]+|~dev[0-9]+|)-[0-9]+$ ]]; then
+ echo >&2 "FATAL: --build-version '$2' is invalid, must match pattern ^[0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+|)(~rc[0-9]+|~dev[0-9]+|)-[0-9]+$"
+ exit 1
else
else
+ [[ "$2" =~ (.*)-(.*) ]]
ARVADOS_BUILDING_VERSION="${BASH_REMATCH[1]}"
ARVADOS_BUILDING_ITERATION="${BASH_REMATCH[2]}"
fi
ARVADOS_BUILDING_VERSION="${BASH_REMATCH[1]}"
ARVADOS_BUILDING_ITERATION="${BASH_REMATCH[2]}"
fi
@@
-186,7
+196,7
@@
fi
echo $TARGET
cd $TARGET
echo $TARGET
cd $TARGET
-time docker build --tag
=$IMAG
E .
+time docker build --tag
"$IMAGE" --build-arg HOSTTYPE=$HOSTTYP
E .
popd
if test -z "$packages" ; then
popd
if test -z "$packages" ; then
@@
-194,6
+204,7
@@
if test -z "$packages" ; then
arvados-client
arvados-controller
arvados-dispatch-cloud
arvados-client
arvados-controller
arvados-dispatch-cloud
+ arvados-dispatch-lsf
arvados-docker-cleaner
arvados-git-httpd
arvados-health
arvados-docker-cleaner
arvados-git-httpd
arvados-health
@@
-222,7
+233,8
@@
if test -z "$packages" ; then
python3-arvados-fuse
python3-arvados-python-client
python3-arvados-cwl-runner
python3-arvados-fuse
python3-arvados-python-client
python3-arvados-cwl-runner
- python3-crunchstat-summary"
+ python3-crunchstat-summary
+ python3-arvados-user-activity"
fi
FINAL_EXITCODE=0
fi
FINAL_EXITCODE=0
@@
-305,6
+317,7
@@
else
--env ARVADOS_DEBUG=$ARVADOS_DEBUG \
--env "ONLY_BUILD=$ONLY_BUILD" \
--env "FORCE_BUILD=$FORCE_BUILD" \
--env ARVADOS_DEBUG=$ARVADOS_DEBUG \
--env "ONLY_BUILD=$ONLY_BUILD" \
--env "FORCE_BUILD=$FORCE_BUILD" \
+ --env "ARCH=$ARCH" \
"$IMAGE" $COMMAND
then
echo
"$IMAGE" $COMMAND
then
echo