From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <avtikhon@tarantool.org>
Received: from smtp57.i.mail.ru (smtp57.i.mail.ru [217.69.128.37])
 (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 98699469710
 for <tarantool-patches@dev.tarantool.org>;
 Sun, 17 May 2020 15:31:14 +0300 (MSK)
Date: Sun, 17 May 2020 15:31:12 +0300
From: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
Message-ID: <20200517123112.GA17304@hpalx>
References: <1589700958.836016889@f506.i.mail.ru>
MIME-Version: 1.0
Content-Type: text/plain; charset="iso-8859-1"
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
In-Reply-To: <1589700958.836016889@f506.i.mail.ru>
Subject: Re: [Tarantool-patches] [PATCH v1] gitlab-ci: integration testing
	vshard
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: Oleg Piskunov <o.piskunov@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org

Hi Oleg, thanks for the patch. I have some minor style corrections below.

On Sun, May 17, 2020 at 10:35:58AM +0300, Oleg Piskunov wrote:
>=20
> =A0
> - Adding new stage "integr_test" for integration
> =A0 testing connectors and modules with Tarantool.
> - Addign module VSHARD for testing in Tarantool
> =A0 development cycle.
> =A0
> Closes #4972
> ---
> =A0
> Github:  https://github.com/tarantool/tarantool/tree/opiskunov/gh-4972-in=
tegration-test-vshard
> Issue:  https://github.com/tarantool/tarantool/issues/4972
>=20
> =A0.gitlab-ci.yml | 11 +++++++++++
> =A0.travis.mk =A0 =A0 | 10 ++++++++++
> =A02 files changed, 21 insertions(+)
> =A0
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 256b368..8576f91 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -1,5 +1,6 @@
> =A0stages:
> =A0 =A0- test
> + =A0- integr_test
> =A0 =A0- perf
> =A0 =A0- cleanup
> =A0
> @@ -183,6 +184,16 @@ freebsd_12_release:
> =A0 =A0script:
> =A0 =A0 =A0- ${GITLAB_MAKE} vms_test_freebsd
> =A0
> +# ###################
> +# Integration testing
> +# ###################
> +
> +release_module_vshard_test:
> + =A0<<: *docker_test_definition
> + =A0stage: integr_test
> + =A0script:
> + =A0 =A0- ${GITLAB_MAKE} test_module_vshard
> +
> =A0# ####
> =A0# Perf
> =A0# ####
> diff --git a/.travis.mk b/.travis.mk
> index 063537f..25e0469 100644
> --- a/.travis.mk
> +++ b/.travis.mk
> @@ -87,6 +87,16 @@ test_debian: deps_debian test_debian_no_deps
> =A0
> =A0test_debian_clang8: deps_debian deps_buster_clang_8 test_debian_no_deps
> =A0
> +# Integration testing
> +
> +test_module_vshard:
> + =A0 =A0 =A0 cmake . -DCMAKE_BUILD_TYPE=3DRelWithDebInfo -DENABLE_WERROR=
=3DON -DENABLE_DIST=3DON ${CMAKE_EXTRA_PARAMS}
> + =A0 =A0 =A0 make -j

Here is the Tarantool building and there is already special rule exists
for it, let's use it, like:

test_module_vshard: build_debian

> + =A0 =A0 =A0 make install
> + =A0 =A0 =A0 git clone https://github.com/tarantool/vshard.git tarantool=
/vshard

A little bit confising here, if you want additional directory like
'tarantool' may be it's better to change it to some name like 'module'.

> + =A0 =A0 =A0 cd tarantool/vshard && git submodule update --init --recurs=
ive \
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 && cmake . && make test

Seems extra 'submodule update' call to git can be merged to its 'clone'
call, like:

git clone --recurse-submodules https://...

> +
> =A0# Debug with coverage
> =A0
> =A0build_coverage_debian:
> --
> 1.8.3.1
> =A0