Tarantool development patches archive
 help / color / mirror / Atom feed
From: Alexander Turenko <alexander.turenko@tarantool.org>
To: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: Re: [Tarantool-patches] [PATCH v1 2/2] gitlab-ci: set timeout variables to jobs
Date: Sun, 27 Dec 2020 07:04:27 +0300	[thread overview]
Message-ID: <20201227040427.jumvds6emu7f4own@tkn_work_nb> (raw)
In-Reply-To: <a0a57c58eb70c55f7d95f649d05ad5d860ba538a.1608928926.git.avtikhon@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.

  reply	other threads:[~2020-12-27  4:04 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-25 20:44 [Tarantool-patches] [PATCH v1 1/2] test: remove obvious part in rpm spec for Travis Alexander V. Tikhonov
2020-12-25 20:44 ` [Tarantool-patches] [PATCH v1 2/2] gitlab-ci: set timeout variables to jobs Alexander V. Tikhonov
2020-12-27  4:04   ` Alexander Turenko [this message]
2020-12-26  3:30 ` [Tarantool-patches] [PATCH v1 1/2] test: remove obvious part in rpm spec for Travis Alexander Turenko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201227040427.jumvds6emu7f4own@tkn_work_nb \
    --to=alexander.turenko@tarantool.org \
    --cc=avtikhon@tarantool.org \
    --cc=tarantool-patches@dev.tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH v1 2/2] gitlab-ci: set timeout variables to jobs' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox