From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp35.i.mail.ru (smtp35.i.mail.ru [94.100.177.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id B164B4765E0 for ; Fri, 25 Dec 2020 23:44:21 +0300 (MSK) From: "Alexander V. Tikhonov" Date: Fri, 25 Dec 2020 23:44:17 +0300 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH v1 2/2] gitlab-ci: set timeout variables to jobs List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexander Turenko Cc: tarantool-patches@dev.tarantool.org Preserved environment variables from gitlab-ci environment to packaging: PRESERVE_ENVVARS=REPLICATION_SYNC_TIMEOUT,TEST_TIMEOUT,NO_OUTPUT_TIMEOUT Different jobs use environment in different ways and formats: - freebsd job uses additional exports for each timeout variable; - out-of-source build uses additional setup of these variables to the docker run process it runs in; - pack/deploy/default_gcc_centos7 jobs additionaly use PRESERVE_ENVVARS variable to pass timeouts variables; - the rest of jobs run inside docker use timeouts variables as they are. Part of tarantool/test-run#251 --- Github: https://github.com/tarantool/tarantool/tree/avtikhon/rpm-spec-timeouts Issue: https://github.com/tarantool/test-run/issues/251 .gitlab-ci.yml | 5 +++++ .travis.mk | 3 +++ 2 files changed, 8 insertions(+) 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 # 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} ; 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} -- 2.25.1