Skip to content

Commit

Permalink
gitlab-ci: preserve timeout variables to packaging
Browse files Browse the repository at this point in the history
Preserved environment variables from gitlab-ci environment to packaging:
  PRESERVE_ENVVARS=REPLICATION_SYNC_TIMEOUT,TEST_TIMEOUT,NO_OUTPUT_TIMEOUT
  REPLICATION_SYNC_TIMEOUT
  TEST_TIMEOUT
  NO_OUTPUT_TIMEOUT

Part of tarantool/test-run#251
  • Loading branch information
avtikhon committed Dec 25, 2020
1 parent 9f8555b commit ea8db49
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
14 changes: 13 additions & 1 deletion .gitlab-ci.yml
Expand Up @@ -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
Expand Down Expand Up @@ -273,6 +277,10 @@ freebsd_12_release:
VMS_USER: 'vagrant'
VMS_PORT: '2232'
MAKE: 'gmake'
EXTRA_ENV: >-
export REPLICATION_SYNC_TIMEOUT=${REPLICATION_SYNC_TIMEOUT} ;
export TEST_TIMEOUT=${TEST_TIMEOUT} ;
export NO_OUTPUT_TIMEOUT=${NO_OUTPUT_TIMEOUT} ;
script:
- ${GITLAB_MAKE} vms_start
- ${GITLAB_MAKE} vms_test_freebsd
Expand Down Expand Up @@ -302,7 +310,11 @@ jepsen-cluster-txm:
default_gcc_centos_7:
<<: *pack_test_definition
variables:
PACKPACK_EXTRA_DOCKER_RUN_PARAMS: '-e CC=/usr/bin/gcc -e CXX=/usr/bin/g++'
PACKPACK_EXTRA_DOCKER_RUN_PARAMS: >-
-e CC=/usr/bin/gcc -e CXX=/usr/bin/g++
-e REPLICATION_SYNC_TIMEOUT=${REPLICATION_SYNC_TIMEOUT}
-e TEST_TIMEOUT=${TEST_TIMEOUT}
-e NO_OUTPUT_TIMEOUT=${NO_OUTPUT_TIMEOUT}
OS: 'el'
DIST: '7'

Expand Down
6 changes: 6 additions & 0 deletions .travis.mk
Expand Up @@ -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}

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit ea8db49

Please sign in to comment.