Tarantool development patches archive
 help / color / mirror / Atom feed
* [Tarantool-patches] [PATCH v3] test: add more tests to packaging testing
@ 2020-03-13  8:51 Alexander V. Tikhonov
  2020-04-24  8:55 ` Oleg Piskunov
  0 siblings, 1 reply; 3+ messages in thread
From: Alexander V. Tikhonov @ 2020-03-13  8:51 UTC (permalink / raw)
  To: Oleg Piskunov; +Cc: tarantool-patches

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 | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec
index ff95ed646..88b1d6b5c 100644
--- a/rpm/tarantool.spec
+++ b/rpm/tarantool.spec
@@ -69,18 +69,21 @@ BuildRequires: libunwind-devel
 %undefine _hardened_build
 %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
+# Set dependences for tests.
+# Do not install unused Python 3 packages which
+# is default since Fedora 31 and CentOS 8.
 %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 +163,19 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}%{_datarootdir}/doc/tarantool/
 
 %check
+%if "%{_ci}" == "travis"
 %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

^ permalink raw reply	[flat|nested] 3+ messages in thread
* [Tarantool-patches] [PATCH v3] test: add more tests to packaging testing
@ 2020-03-13  4:44 Alexander V. Tikhonov
  0 siblings, 0 replies; 3+ messages in thread
From: Alexander V. Tikhonov @ 2020-03-13  4:44 UTC (permalink / raw)
  To: Oleg Piskunov; +Cc: tarantool-patches

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..12fd9ba36 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 "%{_ci}" == "travis"
 %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

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-04-24  8:55 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-13  8:51 [Tarantool-patches] [PATCH v3] test: add more tests to packaging testing Alexander V. Tikhonov
2020-04-24  8:55 ` Oleg Piskunov
  -- strict thread matches above, loose matches on Subject: below --
2020-03-13  4:44 Alexander V. Tikhonov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox