diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 03a6295aa249..acb88e541c2a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,6 +14,10 @@ variables: GIT_STRATEGY: none GIT_CLEAN_FLAGS: none OSX_VARDIR: /tmp/tnt + REPLICATION_SYNC_TIMEOUT: 300 + TEST_TIMEOUT: 310 + NO_OUTPUT_TIMEOUT: 320 + PRESERVE_ENVVARS: REPLICATION_SYNC_TIMEOUT,TEST_TIMEOUT,NO_OUTPUT_TIMEOUT # 1. Git checkout strategy used from: # https://docs.gitlab.com/ee/ci/yaml/README.html#git-checkout diff --git a/.travis.mk b/.travis.mk index 300e14e740d6..76289fddb2e6 100644 --- a/.travis.mk +++ b/.travis.mk @@ -265,6 +265,9 @@ test_oos_build: docker run --network=host -w ${OOS_SRC_PATH} \ --mount type=bind,source="${PWD}",target=${OOS_SRC_PATH},readonly,bind-propagation=rslave \ --tmpfs ${OOS_BUILD_PATH}:exec \ + -e REPLICATION_SYNC_TIMEOUT \ + -e TEST_TIMEOUT \ + -e NO_OUTPUT_TIMEOUT \ -i ${DOCKER_IMAGE_TARANTOOL} \ make -f .travis.mk ${OOS_BUILD_RULE} @@ -362,6 +365,9 @@ build_freebsd: gmake -j test_freebsd_no_deps: build_freebsd + export REPLICATION_SYNC_TIMEOUT=${REPLICATION_SYNC_TIMEOUT} ; \ + export TEST_TIMEOUT=${TEST_TIMEOUT} ; \ + export NO_OUTPUT_TIMEOUT=${NO_OUTPUT_TIMEOUT} ; \ cd test && python2.7 test-run.py --force $(TEST_RUN_EXTRA_PARAMS) test_freebsd: deps_freebsd test_freebsd_no_deps