From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp52.i.mail.ru (smtp52.i.mail.ru [94.100.177.112]) (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 97075469710 for ; Wed, 20 May 2020 19:51:53 +0300 (MSK) Date: Wed, 20 May 2020 19:51:51 +0300 From: "Alexander V. Tikhonov" Message-ID: <20200520165151.GB3113@hpalx> References: <1589822841.925400170@f462.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: <1589822841.925400170@f462.i.mail.ru> Subject: Re: [Tarantool-patches] [PATCH v2] gitlab-ci: integration testing vshard List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Oleg Piskunov Cc: tarantool-patches@dev.tarantool.org Hi Oleg, thanks for the patch, LGTM. On Mon, May 18, 2020 at 08:27:21PM +0300, Oleg Piskunov wrote: >=20 > - Adding new stage "integr_test" for integration > =A0 testing connectors and modules with Tarantool. > - Adding options "-DENABLE_DIST=3DON" into > =A0 "build_debian" target to enable tarantoolctl > =A0 during T installation. > - Adding module VSHARD for testing in Tarantool > =A0 development cycle. > =A0 > Closes #4972 > --- > =A0 > Github: https://github.com/tarantool/tarantool/tree/opiskunov/gh-4972-int= egration-test-vshard > Issue: https://github.com/tarantool/tarantool/issues/4972 >=20 > =A0.gitlab-ci.yml | 11 +++++++++++ > =A0.travis.mk =A0 =A0 | =A09 ++++++++- > =A02 files changed, 19 insertions(+), 1 deletion(-) > =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..1603242 100644 > --- a/.travis.mk > +++ b/.travis.mk > @@ -77,7 +77,7 @@ deps_buster_clang_8: deps_debian > =A0# Release > =A0 > =A0build_debian: > - =A0 =A0 =A0 cmake . -DCMAKE_BUILD_TYPE=3DRelWithDebInfo -DENABLE_WERROR= =3DON ${CMAKE_EXTRA_PARAMS} > + =A0 =A0 =A0 cmake . -DCMAKE_BUILD_TYPE=3DRelWithDebInfo -DENABLE_WERROR= =3DON -DENABLE_DIST=3DON ${CMAKE_EXTRA_PARAMS} > =A0 =A0 =A0 =A0 make -j > =A0 > =A0test_debian_no_deps: build_debian > @@ -87,6 +87,13 @@ 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: build_debian > + =A0 =A0 =A0 make install > + =A0 =A0 =A0 git clone --recurse-submodules https://github.com/tarantool= /vshard.git vshard > + =A0 =A0 =A0 cd vshard && cmake . && make test > + > =A0# Debug with coverage > =A0 > =A0build_coverage_debian: > -- > 1.8.3.1 > =A0