From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <alexander.turenko@tarantool.org>
Received: from smtp32.i.mail.ru (smtp32.i.mail.ru [94.100.177.92])
 (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 67C9D4765E0
 for <tarantool-patches@dev.tarantool.org>;
 Sun, 27 Dec 2020 07:04:14 +0300 (MSK)
Date: Sun, 27 Dec 2020 07:04:27 +0300
From: Alexander Turenko <alexander.turenko@tarantool.org>
Message-ID: <20201227040427.jumvds6emu7f4own@tkn_work_nb>
References: <dc2fd8eab894c78c03a57b1476cf3bd316b7f020.1608928926.git.avtikhon@tarantool.org>
 <a0a57c58eb70c55f7d95f649d05ad5d860ba538a.1608928926.git.avtikhon@tarantool.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <a0a57c58eb70c55f7d95f649d05ad5d860ba538a.1608928926.git.avtikhon@tarantool.org>
Subject: Re: [Tarantool-patches] [PATCH v1 2/2] gitlab-ci: set timeout
	variables to jobs
List-Id: Tarantool development patches <tarantool-patches.dev.tarantool.org>
List-Unsubscribe: <https://lists.tarantool.org/mailman/options/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=unsubscribe>
List-Archive: <https://lists.tarantool.org/pipermail/tarantool-patches/>
List-Post: <mailto:tarantool-patches@dev.tarantool.org>
List-Help: <mailto:tarantool-patches-request@dev.tarantool.org?subject=help>
List-Subscribe: <https://lists.tarantool.org/mailman/listinfo/tarantool-patches>, 
 <mailto:tarantool-patches-request@dev.tarantool.org?subject=subscribe>
To: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org

> 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.