From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp43.i.mail.ru (smtp43.i.mail.ru [94.100.177.103]) (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 2F72B469710 for ; Wed, 20 May 2020 01:15:20 +0300 (MSK) Date: Wed, 20 May 2020 01:14:56 +0300 From: Alexander Turenko Message-ID: <20200519221456.oi5pko5gbl5bp4g3@tkn_work_nb> References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Subject: Re: [Tarantool-patches] [PATCH v4 3/3] test: add more tests to packaging testing List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Alexander V. Tikhonov" Cc: Oleg Piskunov , tarantool-patches@dev.tarantool.org On Tue, May 19, 2020 at 07:30:36AM +0300, Alexander V. Tikhonov wrote: > Changed number of tests to packaging testing jobs from > suites: "unit/ app/ app-tap/ box/ box-tap/ engine/ vinyl/", > to all suites except 'replication/' suite which has special > issue for it's enabling: > https://github.com/tarantool/tarantool/issues/4798 > Also added testing to the all available packing jobs except > 'CentOS 6'. > > Removed test-run option that run testing inline to be > able to run it in parallel. Also changed 'test-run' to Nit: I would say 'test-run.py --force' to 'make test-force', because when I read the comment I did think that it was w/o --force before. > 'make test-force' command. Nit: I would add a few words why Travis CI and GitLab CI testing differs from each other. It is not obvious. > > Closes #4599 > --- > rpm/tarantool.spec | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec > index e15de3c12..88b1d6b5c 100644 > --- a/rpm/tarantool.spec > +++ b/rpm/tarantool.spec > @@ -163,9 +163,19 @@ make %{?_smp_mflags} > rm -rf %{buildroot}%{_datarootdir}/doc/tarantool/ > > %check > +%if "%{_ci}" == "travis" > %if (0%{?fedora} >= 22 || 0%{?rhel} >= 7) > cd test && ./test-run.py --force -j 1 unit/ app/ app-tap/ box/ box-tap/ engine/ vinyl/ > %endif > +%else > +%if 0%{?rhel} != 6 > +# Run all available test suites except 'replication' > +# which is not currently ready for this testing and > +# has standalone issue for it's enabling: > +# https://github.com/tarantool/tarantool/issues/4798 > +TEST_RUN_EXCLUDE='replication/' make test-force > +%endif > +%endif Nit: No need to keep `0%{?fedora} >= 22` condition anymore, you removed it for dependencies in the first commit. So I would change it in the first commit in sync with the change for deps: | %if 0%{?rhel} != 6 | cd test && <...> | %endif And then change here (3rd commit) again to split travis-ci / gitlab-ci testing: | %if 0%{?rhel} != 6 | %if "%{_ci}" == "travis" | cd test && <...> | %else | # Comment. | TEST_RUN_EXCLUDE='replication/' make test-force | %endif | %endif