From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (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 8D94A46970E for ; Mon, 30 Dec 2019 14:10:10 +0300 (MSK) From: "Alexander V. Tikhonov" Date: Mon, 30 Dec 2019 14:10:07 +0300 Message-Id: Subject: [Tarantool-patches] [PATCH v1] test: add more tests to packaging testing List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexander Turenko 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. 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. 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 | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec index ff95ed646..bc1fb5aff 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,13 +161,13 @@ make %{?_smp_mflags} rm -rf %{buildroot}%{_datarootdir}/doc/tarantool/ %check -%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/ +%if (0%{?rhel} != 6) + TEST_RUN_EXCLUDE='replication/' make test-force %endif %pre -- 2.17.1