projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
20690: Update arvados-server boot to serve wb2 at wb1 url.
[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 7b51264cee80fe3703bfa8a057b41a679eb2f658..1ba06fd3688828897efee4d531eee5ea06f7f51e 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"
@@
-183,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
@@
-214,7
+221,6
@@
if test -z "$packages" ; then
arvados-src
arvados-sync-groups
arvados-sync-users
arvados-src
arvados-sync-groups
arvados-sync-users
- arvados-workbench
arvados-workbench2
arvados-ws
crunch-dispatch-local
arvados-workbench2
arvados-ws
crunch-dispatch-local
@@
-242,16
+248,13
@@
FINAL_EXITCODE=0
package_fails=""
package_fails=""
-mkdir -p "$WORKSPACE/apps/workbench/vendor/cache-$TARGET"
mkdir -p "$WORKSPACE/services/api/vendor/cache-$TARGET"
docker_volume_args=(
-v "$JENKINS_DIR:/jenkins"
-v "$WORKSPACE:/arvados"
-v /arvados/services/api/vendor/bundle
mkdir -p "$WORKSPACE/services/api/vendor/cache-$TARGET"
docker_volume_args=(
-v "$JENKINS_DIR:/jenkins"
-v "$WORKSPACE:/arvados"
-v /arvados/services/api/vendor/bundle
- -v /arvados/apps/workbench/vendor/bundle
-v "$WORKSPACE/services/api/vendor/cache-$TARGET:/arvados/services/api/vendor/cache"
-v "$WORKSPACE/services/api/vendor/cache-$TARGET:/arvados/services/api/vendor/cache"
- -v "$WORKSPACE/apps/workbench/vendor/cache-$TARGET:/arvados/apps/workbench/vendor/cache"
)
if [[ -n "$test_packages" ]]; then
)
if [[ -n "$test_packages" ]]; then