[Tarantool-patches] [PATCH v1 2/2] gitlab-ci: set timeout variables to jobs
Alexander Turenko
alexander.turenko at tarantool.org
Sun Dec 27 07:04:27 MSK 2020
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 03a6295aa..c2619edc3 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -14,6 +14,7 @@ variables:
> GIT_STRATEGY: none
> GIT_CLEAN_FLAGS: none
> OSX_VARDIR: /tmp/tnt
> + PRESERVE_ENVVARS: REPLICATION_SYNC_TIMEOUT,TEST_TIMEOUT,NO_OUTPUT_TIMEOUT
I already set it in the GitLab CI web interface. No need to duplicate.
>
> # 1. Git checkout strategy used from:
> # https://docs.gitlab.com/ee/ci/yaml/README.html#git-checkout
> @@ -273,6 +274,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} ;
I would pass all variables that are listed in the PRESERVE_ENVVARS
variable. So we'll able to control all jobs from an one place.
I'll send the patch regarding this soon.
> script:
> - ${GITLAB_MAKE} vms_start
> - ${GITLAB_MAKE} vms_test_freebsd
> diff --git a/.travis.mk b/.travis.mk
> index 09bf91277..6afbfdc67 100644
> --- a/.travis.mk
> +++ b/.travis.mk
> @@ -264,6 +264,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}
Same here.
More information about the Tarantool-patches
mailing list