Only run integration tests with --privileged

galaxyproject · Jan 6, 2019 · bed8b54 · bed8b54
1 parent 06f5abe
commit bed8b54
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/.ci/jenkins/integration-py3/run_tests.sh b/.ci/jenkins/integration-py3/run_tests.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-./run_tests.sh --dockerize --python3 --db postgres --clean_pyc --integration "$@"
+DOCKER_RUN_EXTRA_ARGS="--privileged" ./run_tests.sh --dockerize --python3 --db postgres --clean_pyc --integration "$@"
diff --git a/.ci/jenkins/integration/run_tests.sh b/.ci/jenkins/integration/run_tests.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-./run_tests.sh --dockerize --db postgres --clean_pyc --integration "$@"
+DOCKER_RUN_EXTRA_ARGS="--privileged" ./run_tests.sh --dockerize --db postgres --clean_pyc --integration "$@"
diff --git a/run_tests.sh b/run_tests.sh
@@ -303,7 +303,6 @@ then
     docker --version
     echo "Launching docker container for testing with extra args ${DOCKER_RUN_EXTRA_ARGS}..."
     docker $DOCKER_EXTRA_ARGS run $DOCKER_RUN_EXTRA_ARGS \
-        --cap-add=SYS_ADMIN \
         -e "BUILD_NUMBER=$BUILD_NUMBER" \
         -e "GALAXY_TEST_DATABASE_TYPE=$db_type" \
         -e "LC_ALL=C" \

diff --git a/test/docker/base/run_test_wrapper.sh b/test/docker/base/run_test_wrapper.sh
@@ -51,9 +51,6 @@ cd /galaxy
 
 HOME=/home/galaxy
 
-echo "Testing singularity exec as galaxy user"
-sudo -E -u "#${GALAXY_TEST_UID}" singularity -vvv exec docker://busybox hostname
-
 echo "Running common startup for updated dependencies (if any)"
 sudo -E -u "#${GALAXY_TEST_UID}" ./scripts/common_startup.sh --dev-wheels || { echo "common_startup.sh failed"; exit 1; }