15516: Merge branch 'master' into 15516-fix-arvados-server-dependencies

[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 69defb003be91b7bbfc0dfd45533eb1ae654e231..378c9bbfa39dc9dfedc134636ce5806bf6d6cf65 100755 (executable)
--- a/build/run-build-packages-one-target.sh
+++ b/build/run-build-packages-one-target.sh
@@ -232,8 +232,7 @@ if [[ -n "$test_packages" ]]; then
         fi
         echo
         echo "START: $p test on $IMAGE" >&2
-        # ulimit option can be removed when debian8 and ubuntu1404 are retired
-        if docker run --ulimit nofile=4096:4096 \
+        if docker run \
             --rm \
             "${docker_volume_args[@]}" \
             --env ARVADOS_DEBUG=$ARVADOS_DEBUG \
@@ -262,9 +261,8 @@ else
     set +e
     mv -f ${WORKSPACE}/packages/${TARGET}/* ${WORKSPACE}/packages/${TARGET}/processed/ 2>/dev/null
     set -e
-set -x
-    # Build packages. ulimit option can be removed when debian8 and ubuntu1404 are retired
-    if docker run --ulimit nofile=4096:4096 \
+    # Build packages.
+    if docker run \
         --rm \
         "${docker_volume_args[@]}" \
         --env ARVADOS_BUILDING_VERSION="$ARVADOS_BUILDING_VERSION" \