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

  reply	other threads:[~2020-12-25 20:44 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 ` Alexander V. Tikhonov [this message]
2020-12-27  4:04   ` [Tarantool-patches] [PATCH v1 2/2] gitlab-ci: set timeout variables to jobs Alexander Turenko
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=a0a57c58eb70c55f7d95f649d05ad5d860ba538a.1608928926.git.avtikhon@tarantool.org \
    --to=avtikhon@tarantool.org \
    --cc=alexander.turenko@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