[Tarantool-patches] [PATCH v4 0/3] test: add more tests to packaging testing

[Tarantool-patches] [PATCH v4 0/3] test: add more tests to packaging testing

[Alexander V. Tikhonov]

build: fix rpm packages build on Fedora 32

Tarantool packages build scenario at rpm/tarantool.spec
installs Python packages for Tarantool testing. In some
latest OS like Fedora 32 old Python packages based on
Python 2 version were deprecated and changed to Python 3.
Currently Tarantool testing based on Python 2 which
packages stored at local backport repository and it
should be used from there calling it as python2-* packages.

Issue:
...
No matching package to install: 'python-yaml >= 3.0.9'
...
Not all dependencies satisfied
Error: Some packages could not be found.

Needed for #4599
Closes #4965

test: add more tests to packaging testing

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.

Found that issues #1227 and #1322 were closed, returned
the tests blocked by it into the testing.

Closes #4599

---

V4: Splited the patch into patch set of 3 commits, due to found
that RPM spec file for Tarantool build should be fixed the same
way with changing Python3 to Python2 for Fedora 32.


Alexander V. Tikhonov (3):
  build: fix rpm packages build on Fedora 32
  test: return tests to packaging testing
  test: add more tests to packaging testing

 rpm/tarantool.spec | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

-- 
2.17.1

[Tarantool-patches] [PATCH v4 1/3] build: fix rpm packages build on Fedora 32

[Alexander V. Tikhonov]

Tarantool packages build scenario at rpm/tarantool.spec
installs Python packages for Tarantool testing. In some
latest OS like Fedora 32 old Python packages based on
Python 2 version were deprecated and changed to Python 3.
Currently Tarantool testing based on Python 2 which
packages stored at local backport repository and it
should be used from there calling it as python2-* packages.

Issue:
...
No matching package to install: 'python-yaml >= 3.0.9'
...
Not all dependencies satisfied
Error: Some packages could not be found.

Needed for #4599
Closes #4965
---
 rpm/tarantool.spec | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec
index ff95ed646..529c18b38 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
-- 
2.17.1

[Tarantool-patches] [PATCH v4 2/3] test: return tests to packaging testing

[Alexander V. Tikhonov]

Found that issues #1227 and #1322 were closed, returned
the tests blocked by it into the testing.

Part of #4599
---
 rpm/tarantool.spec | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec
index 529c18b38..e15de3c12 100644
--- a/rpm/tarantool.spec
+++ b/rpm/tarantool.spec
@@ -164,11 +164,6 @@ 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/
 %endif
 
-- 
2.17.1

[Tarantool-patches] [PATCH v4 3/3] test: add more tests to packaging testing

[Alexander V. Tikhonov]

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.

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
 
 %pre
 /usr/sbin/groupadd -r tarantool > /dev/null 2>&1 || :
-- 
2.17.1

Re: [Tarantool-patches] [PATCH v4 3/3] test: add more tests to packaging testing

[Alexander Turenko]

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

Re: [Tarantool-patches] [PATCH v4 0/3] test: add more tests to packaging testing

[Alexander Turenko]

branch: avtikhon/gh-4599-packages-testing-full-ci

> ---

> Alexander V. Tikhonov (3):
>   build: fix rpm packages build on Fedora 32
>   test: return tests to packaging testing
>   test: add more tests to packaging testing

LGTM. CCed Kirill.

I left a couple of minor comments in [1], but they are really minor:
feel free to ignore. No need to re-review with me if you'll change the
patchset according to them.

[1]: https://lists.tarantool.org/pipermail/tarantool-patches/2020-May/016881.html

WBR, Alexander Turenko.

Re: [Tarantool-patches] [PATCH v4 0/3] test: add more tests to packaging testing

[Kirill Yukhin]

Hello,

On 19 май 07:30, Alexander V. Tikhonov wrote:
> build: fix rpm packages build on Fedora 32
> 
> Tarantool packages build scenario at rpm/tarantool.spec
> installs Python packages for Tarantool testing. In some
> latest OS like Fedora 32 old Python packages based on
> Python 2 version were deprecated and changed to Python 3.
> Currently Tarantool testing based on Python 2 which
> packages stored at local backport repository and it
> should be used from there calling it as python2-* packages.
> 
> Issue:
> ...
> No matching package to install: 'python-yaml >= 3.0.9'
> ...
> Not all dependencies satisfied
> Error: Some packages could not be found.
> 
> Needed for #4599
> Closes #4965
> 
> test: add more tests to packaging testing
> 
> 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.
> 
> Found that issues #1227 and #1322 were closed, returned
> the tests blocked by it into the testing.
> 
> Closes #4599

I've checked your patchset into 1.10, 2.3, 2.4 and master.

--
Regards, Kirill Yukhin