opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-01 15:37:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Only run integration tests with --privileged

Browse Source
This commit is contained in:
mvdbeek
2018-12-20 19:38:54 +01:00
parent 06f5abe1bc
commit bed8b54af6
4 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.ci/jenkins/integration-py3/run_tests.sh
+1 -1
View File
@@ -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 "$@"
.ci/jenkins/integration/run_tests.sh
+1 -1
View File
@@ -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 "$@"
run_tests.sh
-1
View File
@@ -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" \
test/docker/base/run_test_wrapper.sh
-3
View File
@@ -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; }