From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (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 81501469719 for ; Thu, 12 Mar 2020 08:24:59 +0300 (MSK) From: "Alexander V. Tikhonov" Date: Thu, 12 Mar 2020 08:24:56 +0300 Message-Id: <6a7ab0fceb1718b5513a420cf36f34efcea11c85.1583990647.git.avtikhon@tarantool.org> Subject: [Tarantool-patches] [PATCH v2] test: add more tests to packaging testing List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Oleg Piskunov Cc: tarantool-patches@dev.tarantool.org 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 'make test-force' command. After issues #1227 and #1322 the tests were returned into the testing. Closes #4599 --- Github: https://github.com/tarantool/tarantool/tree/avtikhon/gh-4599-packages-testing-full-ci Issue: https://github.com/tarantool/tarantool/issues/4599 rpm/tarantool.spec | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec index ff95ed646..ed1cff7fd 100644 --- a/rpm/tarantool.spec +++ b/rpm/tarantool.spec @@ -70,17 +70,18 @@ BuildRequires: libunwind-devel %endif # For tests -%if (0%{?fedora} >= 22 || 0%{?rhel} == 7) -BuildRequires: python >= 2.7 -BuildRequires: python-six >= 1.9.0 -BuildRequires: python-gevent >= 1.0 -BuildRequires: python-yaml >= 3.0.9 -%endif %if (0%{?fedora} >= 31 || 0%{?rhel} >= 8) BuildRequires: python2 >= 2.7 BuildRequires: python2-six >= 1.9.0 BuildRequires: python2-gevent >= 1.0 BuildRequires: python2-yaml >= 3.0.9 +%else +%if (0%{?rhel} != 6) +BuildRequires: python >= 2.7 +BuildRequires: python-six >= 1.9.0 +BuildRequires: python-gevent >= 1.0 +BuildRequires: python-yaml >= 3.0.9 +%endif %endif Name: tarantool @@ -160,14 +161,19 @@ make %{?_smp_mflags} rm -rf %{buildroot}%{_datarootdir}/doc/tarantool/ %check +%if "IS_TRAVIS" == "true" %if (0%{?fedora} >= 22 || 0%{?rhel} >= 7) -# https://github.com/tarantool/tarantool/issues/1227 -echo "self.skip = True" > ./test/app/socket.skipcond -# https://github.com/tarantool/tarantool/issues/1322 -echo "self.skip = True" > ./test/app/digest.skipcond -# run a safe subset of the test suite 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 %pre /usr/sbin/groupadd -r tarantool > /dev/null 2>&1 || : -- 2.17.1