projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
21832: Allows custom backup retention period config.
[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 37fe7052413c95b118f97b7a390f5bbfb14dee0f..a200e14a03916f5dccbcc3b3aed995724608a698 100755
(executable)
--- a/
build/run-build-packages-one-target.sh
+++ b/
build/run-build-packages-one-target.sh
@@
-198,7
+198,7
@@
if [[ -n "$test_packages" ]]; then
else
IMAGE="arvados/build:$TARGET"
if [[ "$COMMAND" != "" ]]; then
else
IMAGE="arvados/build:$TARGET"
if [[ "$COMMAND" != "" ]]; then
- COMMAND="
/usr/local/rvm/bin/rvm-exec default
bash /jenkins/$COMMAND --target $TARGET$DEBUG"
+ COMMAND="bash /jenkins/$COMMAND --target $TARGET$DEBUG"
fi
fi
fi
fi
@@
-206,11
+206,10
@@
JENKINS_DIR=$(dirname "$(readlink -e "$0")")
if [[ "$SKIP_DOCKER_BUILD" != 1 ]] ; then
if [[ -n "$test_packages" ]]; then
if [[ "$SKIP_DOCKER_BUILD" != 1 ]] ; then
if [[ -n "$test_packages" ]]; then
- pushd "$JENKINS_DIR/package-test-dockerfiles"
- make "$TARGET/generated"
+ pushd "$JENKINS_DIR/package-test-dockerfiles"
else
else
- pushd "$JENKINS_DIR/package-build-dockerfiles"
- make "$TARGET/generated"
+
pushd "$JENKINS_DIR/package-build-dockerfiles"
+
make "$TARGET/generated"
fi
GOVERSION=$(grep 'const goversion =' $WORKSPACE/lib/install/deps.go |awk -F'"' '{print $2}')
fi
GOVERSION=$(grep 'const goversion =' $WORKSPACE/lib/install/deps.go |awk -F'"' '{print $2}')
@@
-231,7
+230,6
@@
if test -z "$packages" ; then
arvados-dispatch-cloud
arvados-dispatch-lsf
arvados-docker-cleaner
arvados-dispatch-cloud
arvados-dispatch-lsf
arvados-docker-cleaner
- arvados-git-httpd
arvados-health
arvados-server
arvados-src
arvados-health
arvados-server
arvados-src
@@
-254,8
+252,7
@@
if test -z "$packages" ; then
python3-arvados-fuse
python3-arvados-python-client
python3-arvados-user-activity
python3-arvados-fuse
python3-arvados-python-client
python3-arvados-user-activity
- python3-crunchstat-summary
- python3-cwltest"
+ python3-crunchstat-summary"
fi
FINAL_EXITCODE=0
fi
FINAL_EXITCODE=0
@@
-267,7
+264,8
@@
mkdir -p "$WORKSPACE/services/api/vendor/cache-$TARGET"
docker_volume_args=(
-v "$JENKINS_DIR:/jenkins"
-v "$WORKSPACE:/arvados"
docker_volume_args=(
-v "$JENKINS_DIR:/jenkins"
-v "$WORKSPACE:/arvados"
- -v /arvados/services/api/vendor/bundle
+ --tmpfs /arvados/services/api/.bundle:rw,noexec,nosuid,size=1m
+ --tmpfs /arvados/services/api/vendor:rw,exec,nosuid,size=1g
-v "$WORKSPACE/services/api/vendor/cache-$TARGET:/arvados/services/api/vendor/cache"
)
-v "$WORKSPACE/services/api/vendor/cache-$TARGET:/arvados/services/api/vendor/cache"
)