projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
17244: Add upgrade note re number formatting change.
[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 c1cc2e5877b6a695fb25605585e1c0e9a79ac041..7b51264cee80fe3703bfa8a057b41a679eb2f658 100755
(executable)
--- a/
build/run-build-packages-one-target.sh
+++ b/
build/run-build-packages-one-target.sh
@@
-139,16
+139,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
@@
-193,9
+191,14
@@
else
make "$TARGET/generated"
fi
make "$TARGET/generated"
fi
+GOVERSION=$(grep 'const goversion =' $WORKSPACE/lib/install/deps.go |awk -F'"' '{print $2}')
+
echo $TARGET
cd $TARGET
echo $TARGET
cd $TARGET
-time docker build --tag "$IMAGE" --build-arg HOSTTYPE=$HOSTTYPE --build-arg BRANCH=$(git rev-parse --abbrev-ref HEAD) .
+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
if test -z "$packages" ; then
popd
if test -z "$packages" ; then
@@
-210,13
+213,13
@@
if test -z "$packages" ; then
arvados-server
arvados-src
arvados-sync-groups
arvados-server
arvados-src
arvados-sync-groups
+ arvados-sync-users
arvados-workbench
arvados-workbench2
arvados-ws
crunch-dispatch-local
crunch-dispatch-slurm
crunch-run
arvados-workbench
arvados-workbench2
arvados-ws
crunch-dispatch-local
crunch-dispatch-slurm
crunch-run
- crunchstat
keepproxy
keepstore
keep-balance
keepproxy
keepstore
keep-balance
@@
-226,7
+229,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