projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
20831: more test fixes
[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 7d9b5b6a37abb14185a693ff331859137d7f4082..29370279c6e11f7cd8a6e75ecb67f43302ad630c 100755
(executable)
--- a/
build/run-build-packages-one-target.sh
+++ b/
build/run-build-packages-one-target.sh
@@
-32,6
+32,8
@@
Syntax:
Version to build (default:
\$ARVADOS_BUILDING_VERSION-\$ARVADOS_BUILDING_ITERATION or
0.1.timestamp.commithash)
Version to build (default:
\$ARVADOS_BUILDING_VERSION-\$ARVADOS_BUILDING_ITERATION or
0.1.timestamp.commithash)
+--skip-docker-build
+ Don't try to build Docker images
WORKSPACE=path Path to the Arvados source tree to build packages from
WORKSPACE=path Path to the Arvados source tree to build packages from
@@
-56,7
+58,7
@@
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,arch:,build-version: \
+ help,debug,test-packages,target:,command:,only-test:,force-test,only-build:,force-build,arch:,build-version:
,skip-docker-build
\
-- "" "$@")
if [ $? -ne 0 ]; then
exit 1
-- "" "$@")
if [ $? -ne 0 ]; then
exit 1
@@
-121,6
+123,9
@@
while [ $# -gt 0 ]; do
fi
shift
;;
fi
shift
;;
+ --skip-docker-build)
+ SKIP_DOCKER_BUILD=1
+ ;;
--)
if [ $# -gt 1 ]; then
echo >&2 "$0: unrecognized argument '$2'. Try: $0 --help"
--)
if [ $# -gt 1 ]; then
echo >&2 "$0: unrecognized argument '$2'. Try: $0 --help"
@@
-139,16
+144,14
@@
fi
if [[ -n "$test_packages" ]]; then
if [[ -n "$(find $WORKSPACE/packages/$TARGET -name '*.rpm')" ]] ; then
if [[ -n "$test_packages" ]]; then
if [[ -n "$(find $WORKSPACE/packages/$TARGET -name '*.rpm')" ]] ; then
- set +e
- /usr/bin/which createrepo >/dev/null
- if [[ "$?" != "0" ]]; then
+ CREATEREPO="$(command -v createrepo createrepo_c | tail -n1)"
+ if [[ -z "$CREATEREPO" ]]; then
echo >&2
echo >&2
- echo >&2 "Error: please install createrepo. E.g. sudo apt
-get install createrepo
"
+ echo >&2 "Error: please install createrepo. E.g. sudo apt
install createrepo-c
"
echo >&2
exit 1
fi
echo >&2
exit 1
fi
- set -e
- createrepo $WORKSPACE/packages/$TARGET
+ "$CREATEREPO" $WORKSPACE/packages/$TARGET
fi
if [[ -n "$(find $WORKSPACE/packages/$TARGET -name '*.deb')" ]] ; then
fi
if [[ -n "$(find $WORKSPACE/packages/$TARGET -name '*.deb')" ]] ; then
@@
-185,23
+188,25
@@
fi
JENKINS_DIR=$(dirname "$(readlink -e "$0")")
JENKINS_DIR=$(dirname "$(readlink -e "$0")")
-if [[ -n "$test_packages" ]]; then
- pushd "$JENKINS_DIR/package-test-dockerfiles"
- make "$TARGET/generated"
-else
- pushd "$JENKINS_DIR/package-build-dockerfiles"
- make "$TARGET/generated"
-fi
+if [[ "$SKIP_DOCKER_BUILD" != 1 ]] ; then
+ if [[ -n "$test_packages" ]]; then
+ pushd "$JENKINS_DIR/package-test-dockerfiles"
+ make "$TARGET/generated"
+ else
+ pushd "$JENKINS_DIR/package-build-dockerfiles"
+ make "$TARGET/generated"
+ fi
-GOVERSION=$(grep 'const goversion =' $WORKSPACE/lib/install/deps.go |awk -F'"' '{print $2}')
+
GOVERSION=$(grep 'const goversion =' $WORKSPACE/lib/install/deps.go |awk -F'"' '{print $2}')
-echo $TARGET
-cd $TARGET
-time docker build --tag "$IMAGE" \
- --build-arg HOSTTYPE=$HOSTTYPE \
- --build-arg BRANCH=$(git rev-parse --abbrev-ref HEAD) \
- --build-arg GOVERSION=$GOVERSION --no-cache .
-popd
+ echo $TARGET
+ cd $TARGET
+ time docker build --tag "$IMAGE" \
+ --build-arg HOSTTYPE=$HOSTTYPE \
+ --build-arg BRANCH=$(git rev-parse --abbrev-ref HEAD) \
+ --build-arg GOVERSION=$GOVERSION --no-cache .
+ popd
+fi
if test -z "$packages" ; then
packages="arvados-api-server
if test -z "$packages" ; then
packages="arvados-api-server
@@
-222,7
+227,6
@@
if test -z "$packages" ; then
crunch-dispatch-local
crunch-dispatch-slurm
crunch-run
crunch-dispatch-local
crunch-dispatch-slurm
crunch-run
- crunchstat
keepproxy
keepstore
keep-balance
keepproxy
keepstore
keep-balance
@@
-232,7
+236,6
@@
if test -z "$packages" ; then
keep-rsync
keep-block-check
keep-web
keep-rsync
keep-block-check
keep-web
- libarvados-perl
libpam-arvados-go
python3-cwltest
python3-arvados-fuse
libpam-arvados-go
python3-cwltest
python3-arvados-fuse