diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 768d755902..8fa1b983ff 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -509,7 +509,7 @@ cactus_integration: - 'src/toil/test/cactus/test_cactus_integration.py' stage: integration script: - - export CACTUS_COMMIT_SHA=2d706d9c6637c85116533477693e6c73ed5b8a53 + - export CACTUS_COMMIT_SHA=03295e9af99e2e9168ccd02e78a9f4c0c8dcd490 - set -e - ${MAIN_PYTHON_PKG} -m virtualenv venv && . venv/bin/activate && make prepare && make develop extras=[aws] - python setup_gitlab_docker.py # login to increase the docker.io rate limit diff --git a/src/toil/test/wdl/wdltoil_test_kubernetes.py b/src/toil/test/wdl/wdltoil_test_kubernetes.py index 26d4962c17..161b2154de 100644 --- a/src/toil/test/wdl/wdltoil_test_kubernetes.py +++ b/src/toil/test/wdl/wdltoil_test_kubernetes.py @@ -14,7 +14,7 @@ @integrative @slow -@pytest.mark.timeout(600) +@pytest.mark.timeout(1800) class WDLKubernetesClusterTest(AbstractClusterTest): """ Ensure WDL works on the Kubernetes batchsystem.