[tarantool-patches] [PATCH] Switch CI test-run to one job

[tarantool-patches] [PATCH] Switch CI test-run to one job

[Sergei Voronezhskii]

The -j -1 used to legacy consistent mode. Reducing the number of jobs to one
by switching to -j 1, uses same part of the code as in parallel mode. The code
in parallel mode kills hung tests.

Part of https://github.com/tarantool/test-run/issues/106
---
 .travis.mk         | 6 +++---
 rpm/tarantool.spec | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.mk b/.travis.mk
index 66c921aa7..23f804cde 100644
--- a/.travis.mk
+++ b/.travis.mk
@@ -42,7 +42,7 @@ deps_ubuntu:
 test_ubuntu: deps_ubuntu
 	cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo
 	make -j8
-	cd test && /usr/bin/python test-run.py -j -1
+	cd test && /usr/bin/python test-run.py -j 1
 
 deps_osx:
 	brew update
@@ -62,14 +62,14 @@ test_osx: deps_osx
 	curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python && \
 	pip --version && \
 	pip install -r test-run/requirements.txt && \
-	cd test && python test-run.py -j -1 unit/ app/ app-tap/ box/ box-tap/ && \
+	cd test && python test-run.py -j 1 unit/ app/ app-tap/ box/ box-tap/ && \
 	deactivate
 
 coverage_ubuntu: deps_ubuntu
 	cmake . -DCMAKE_BUILD_TYPE=Debug -DENABLE_GCOV=ON
 	make -j8
 	# Enable --long tests for coverage
-	cd test && /usr/bin/python test-run.py -j -1 --long
+	cd test && /usr/bin/python test-run.py -j 1 --long
 	lcov --compat-libtool --directory src/ --capture --output-file coverage.info.tmp
 	lcov --compat-libtool --remove coverage.info.tmp 'tests/*' 'third_party/*' '/usr/*' \
 		--output-file coverage.info
diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec
index 252e563fc..c87b1667d 100644
--- a/rpm/tarantool.spec
+++ b/rpm/tarantool.spec
@@ -150,7 +150,7 @@ 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 -j -1 unit/ app/ app-tap/ box/ box-tap/ engine/ vinyl/
+cd test && ./test-run.py -j 1 unit/ app/ app-tap/ box/ box-tap/ engine/ vinyl/
 %endif
 
 %pre
-- 
2.18.0

[tarantool-patches] Re: [PATCH] Switch CI test-run to one job

[Alexander Turenko]

Hi!

Thanks for the patch!

The commit itself looks good for me, but I want to see Travis CI status
and have several notes related to our processes. Please, push the
branch, look for Travis CI status and ask Kirill to review / check-in
the patch into 1.9 branch.

Notes:

I think such commits should have 'test:' prefix in the commit header.

Please, mention the branch name in the tarantool/tarantool repository in
the email (place it under `---` mark in a file generated by `git
format-patch`).

A commit message body should be 72 characters length, consider [1].

[1]: https://tarantool.io/en/doc/1.9/dev_guide/developer_guidelines/#how-to-write-a-commit-message

WBR, Alexander Turenko.

On Sat, Aug 04, 2018 at 03:31:52PM +0300, Sergei Voronezhskii wrote:
> The -j -1 used to legacy consistent mode. Reducing the number of jobs to one
> by switching to -j 1, uses same part of the code as in parallel mode. The code
> in parallel mode kills hung tests.
> 
> Part of https://github.com/tarantool/test-run/issues/106
> ---
>  .travis.mk         | 6 +++---
>  rpm/tarantool.spec | 2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/.travis.mk b/.travis.mk
> index 66c921aa7..23f804cde 100644
> --- a/.travis.mk
> +++ b/.travis.mk
> @@ -42,7 +42,7 @@ deps_ubuntu:
>  test_ubuntu: deps_ubuntu
>  	cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo
>  	make -j8
> -	cd test && /usr/bin/python test-run.py -j -1
> +	cd test && /usr/bin/python test-run.py -j 1
>  
>  deps_osx:
>  	brew update
> @@ -62,14 +62,14 @@ test_osx: deps_osx
>  	curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python && \
>  	pip --version && \
>  	pip install -r test-run/requirements.txt && \
> -	cd test && python test-run.py -j -1 unit/ app/ app-tap/ box/ box-tap/ && \
> +	cd test && python test-run.py -j 1 unit/ app/ app-tap/ box/ box-tap/ && \
>  	deactivate
>  
>  coverage_ubuntu: deps_ubuntu
>  	cmake . -DCMAKE_BUILD_TYPE=Debug -DENABLE_GCOV=ON
>  	make -j8
>  	# Enable --long tests for coverage
> -	cd test && /usr/bin/python test-run.py -j -1 --long
> +	cd test && /usr/bin/python test-run.py -j 1 --long
>  	lcov --compat-libtool --directory src/ --capture --output-file coverage.info.tmp
>  	lcov --compat-libtool --remove coverage.info.tmp 'tests/*' 'third_party/*' '/usr/*' \
>  		--output-file coverage.info
> diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec
> index 252e563fc..c87b1667d 100644
> --- a/rpm/tarantool.spec
> +++ b/rpm/tarantool.spec
> @@ -150,7 +150,7 @@ 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 -j -1 unit/ app/ app-tap/ box/ box-tap/ engine/ vinyl/
> +cd test && ./test-run.py -j 1 unit/ app/ app-tap/ box/ box-tap/ engine/ vinyl/
>  %endif
>  
>  %pre
> -- 
> 2.18.0
> 
> 

[tarantool-patches] [PATCH] test: Switch CI test-run to one job

[Sergei Voronezhskii]

The -j -1 used to legacy consistent mode. Reducing the number of jobs
to one by switching to -j 1, uses same part of the code as in parallel
mode. The code in parallel mode kills hung tests.

Part of https://github.com/tarantool/test-run/issues/106
---
 branch: https://github.com/tarantool/tarantool/tree/test-switch-ci-to-one-job
 build: https://travis-ci.org/tarantool/tarantool/builds/412547641
 .travis.mk         | 6 +++---
 rpm/tarantool.spec | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.mk b/.travis.mk
index 66c921aa7..23f804cde 100644
--- a/.travis.mk
+++ b/.travis.mk
@@ -42,7 +42,7 @@ deps_ubuntu:
 test_ubuntu: deps_ubuntu
 	cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo
 	make -j8
-	cd test && /usr/bin/python test-run.py -j -1
+	cd test && /usr/bin/python test-run.py -j 1
 
 deps_osx:
 	brew update
@@ -62,14 +62,14 @@ test_osx: deps_osx
 	curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python && \
 	pip --version && \
 	pip install -r test-run/requirements.txt && \
-	cd test && python test-run.py -j -1 unit/ app/ app-tap/ box/ box-tap/ && \
+	cd test && python test-run.py -j 1 unit/ app/ app-tap/ box/ box-tap/ && \
 	deactivate
 
 coverage_ubuntu: deps_ubuntu
 	cmake . -DCMAKE_BUILD_TYPE=Debug -DENABLE_GCOV=ON
 	make -j8
 	# Enable --long tests for coverage
-	cd test && /usr/bin/python test-run.py -j -1 --long
+	cd test && /usr/bin/python test-run.py -j 1 --long
 	lcov --compat-libtool --directory src/ --capture --output-file coverage.info.tmp
 	lcov --compat-libtool --remove coverage.info.tmp 'tests/*' 'third_party/*' '/usr/*' \
 		--output-file coverage.info
diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec
index 252e563fc..c87b1667d 100644
--- a/rpm/tarantool.spec
+++ b/rpm/tarantool.spec
@@ -150,7 +150,7 @@ 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 -j -1 unit/ app/ app-tap/ box/ box-tap/ engine/ vinyl/
+cd test && ./test-run.py -j 1 unit/ app/ app-tap/ box/ box-tap/ engine/ vinyl/
 %endif
 
 %pre
-- 
2.18.0

[tarantool-patches] Re: [PATCH] test: Switch CI test-run to one job

[Alexander Turenko]

Hi!

Just one note:

Start a message header with a lower case letter after a prefix. Look
`git log` for examples.

The rest LGTM. Please, update the commit and continue review with
Kirill Yu.

WBR, Alexander Turenko.

On Mon, Aug 06, 2018 at 02:30:27PM +0300, Sergei Voronezhskii wrote:
> The -j -1 used to legacy consistent mode. Reducing the number of jobs
> to one by switching to -j 1, uses same part of the code as in parallel
> mode. The code in parallel mode kills hung tests.
> 
> Part of https://github.com/tarantool/test-run/issues/106
> ---
>  branch: https://github.com/tarantool/tarantool/tree/test-switch-ci-to-one-job
>  build: https://travis-ci.org/tarantool/tarantool/builds/412547641
>  .travis.mk         | 6 +++---
>  rpm/tarantool.spec | 2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/.travis.mk b/.travis.mk
> index 66c921aa7..23f804cde 100644
> --- a/.travis.mk
> +++ b/.travis.mk
> @@ -42,7 +42,7 @@ deps_ubuntu:
>  test_ubuntu: deps_ubuntu
>  	cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo
>  	make -j8
> -	cd test && /usr/bin/python test-run.py -j -1
> +	cd test && /usr/bin/python test-run.py -j 1
>  
>  deps_osx:
>  	brew update
> @@ -62,14 +62,14 @@ test_osx: deps_osx
>  	curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python && \
>  	pip --version && \
>  	pip install -r test-run/requirements.txt && \
> -	cd test && python test-run.py -j -1 unit/ app/ app-tap/ box/ box-tap/ && \
> +	cd test && python test-run.py -j 1 unit/ app/ app-tap/ box/ box-tap/ && \
>  	deactivate
>  
>  coverage_ubuntu: deps_ubuntu
>  	cmake . -DCMAKE_BUILD_TYPE=Debug -DENABLE_GCOV=ON
>  	make -j8
>  	# Enable --long tests for coverage
> -	cd test && /usr/bin/python test-run.py -j -1 --long
> +	cd test && /usr/bin/python test-run.py -j 1 --long
>  	lcov --compat-libtool --directory src/ --capture --output-file coverage.info.tmp
>  	lcov --compat-libtool --remove coverage.info.tmp 'tests/*' 'third_party/*' '/usr/*' \
>  		--output-file coverage.info
> diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec
> index 252e563fc..c87b1667d 100644
> --- a/rpm/tarantool.spec
> +++ b/rpm/tarantool.spec
> @@ -150,7 +150,7 @@ 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 -j -1 unit/ app/ app-tap/ box/ box-tap/ engine/ vinyl/
> +cd test && ./test-run.py -j 1 unit/ app/ app-tap/ box/ box-tap/ engine/ vinyl/
>  %endif
>  
>  %pre
> -- 
> 2.18.0
> 
> 

[tarantool-patches] [PATCH] test: switch CI test-run to one job

[Sergei Voronezhskii]

The -j -1 used to legacy consistent mode. Reducing the number of jobs
to one by switching to -j 1, uses same part of the code as in parallel
mode. The code in parallel mode kills hung tests.

Part of https://github.com/tarantool/test-run/issues/106
---
 branch: https://github.com/tarantool/tarantool/tree/test-switch-ci-to-one-job
 build: https://travis-ci.org/tarantool/tarantool/builds/412547641
 .travis.mk         | 6 +++---
 rpm/tarantool.spec | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.mk b/.travis.mk
index 66c921aa7..23f804cde 100644
--- a/.travis.mk
+++ b/.travis.mk
@@ -42,7 +42,7 @@ deps_ubuntu:
 test_ubuntu: deps_ubuntu
 	cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo
 	make -j8
-	cd test && /usr/bin/python test-run.py -j -1
+	cd test && /usr/bin/python test-run.py -j 1
 
 deps_osx:
 	brew update
@@ -62,14 +62,14 @@ test_osx: deps_osx
 	curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python && \
 	pip --version && \
 	pip install -r test-run/requirements.txt && \
-	cd test && python test-run.py -j -1 unit/ app/ app-tap/ box/ box-tap/ && \
+	cd test && python test-run.py -j 1 unit/ app/ app-tap/ box/ box-tap/ && \
 	deactivate
 
 coverage_ubuntu: deps_ubuntu
 	cmake . -DCMAKE_BUILD_TYPE=Debug -DENABLE_GCOV=ON
 	make -j8
 	# Enable --long tests for coverage
-	cd test && /usr/bin/python test-run.py -j -1 --long
+	cd test && /usr/bin/python test-run.py -j 1 --long
 	lcov --compat-libtool --directory src/ --capture --output-file coverage.info.tmp
 	lcov --compat-libtool --remove coverage.info.tmp 'tests/*' 'third_party/*' '/usr/*' \
 		--output-file coverage.info
diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec
index 252e563fc..c87b1667d 100644
--- a/rpm/tarantool.spec
+++ b/rpm/tarantool.spec
@@ -150,7 +150,7 @@ 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 -j -1 unit/ app/ app-tap/ box/ box-tap/ engine/ vinyl/
+cd test && ./test-run.py -j 1 unit/ app/ app-tap/ box/ box-tap/ engine/ vinyl/
 %endif
 
 %pre
-- 
2.18.0

[tarantool-patches] Re: [PATCH] test: switch CI test-run to one job

[Alexander Turenko]

Hi!

LGTM.

CCed Kirill.

WBR, Alexander Turenko.

On Mon, Aug 06, 2018 at 11:30:39PM +0300, Sergei Voronezhskii wrote:
> The -j -1 used to legacy consistent mode. Reducing the number of jobs
> to one by switching to -j 1, uses same part of the code as in parallel
> mode. The code in parallel mode kills hung tests.
> 
> Part of https://github.com/tarantool/test-run/issues/106
> ---
>  branch: https://github.com/tarantool/tarantool/tree/test-switch-ci-to-one-job
>  build: https://travis-ci.org/tarantool/tarantool/builds/412547641
>  .travis.mk         | 6 +++---
>  rpm/tarantool.spec | 2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/.travis.mk b/.travis.mk
> index 66c921aa7..23f804cde 100644
> --- a/.travis.mk
> +++ b/.travis.mk
> @@ -42,7 +42,7 @@ deps_ubuntu:
>  test_ubuntu: deps_ubuntu
>  	cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo
>  	make -j8
> -	cd test && /usr/bin/python test-run.py -j -1
> +	cd test && /usr/bin/python test-run.py -j 1
>  
>  deps_osx:
>  	brew update
> @@ -62,14 +62,14 @@ test_osx: deps_osx
>  	curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python && \
>  	pip --version && \
>  	pip install -r test-run/requirements.txt && \
> -	cd test && python test-run.py -j -1 unit/ app/ app-tap/ box/ box-tap/ && \
> +	cd test && python test-run.py -j 1 unit/ app/ app-tap/ box/ box-tap/ && \
>  	deactivate
>  
>  coverage_ubuntu: deps_ubuntu
>  	cmake . -DCMAKE_BUILD_TYPE=Debug -DENABLE_GCOV=ON
>  	make -j8
>  	# Enable --long tests for coverage
> -	cd test && /usr/bin/python test-run.py -j -1 --long
> +	cd test && /usr/bin/python test-run.py -j 1 --long
>  	lcov --compat-libtool --directory src/ --capture --output-file coverage.info.tmp
>  	lcov --compat-libtool --remove coverage.info.tmp 'tests/*' 'third_party/*' '/usr/*' \
>  		--output-file coverage.info
> diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec
> index 252e563fc..c87b1667d 100644
> --- a/rpm/tarantool.spec
> +++ b/rpm/tarantool.spec
> @@ -150,7 +150,7 @@ 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 -j -1 unit/ app/ app-tap/ box/ box-tap/ engine/ vinyl/
> +cd test && ./test-run.py -j 1 unit/ app/ app-tap/ box/ box-tap/ engine/ vinyl/
>  %endif
>  
>  %pre
> -- 
> 2.18.0
> 
> 

[tarantool-patches] Re: [PATCH] test: switch CI test-run to one job

[Kirill Yukhin]

Hello Serge,
On 06 авг 23:30, Sergei Voronezhskii wrote:
> The -j -1 used to legacy consistent mode. Reducing the number of jobs
> to one by switching to -j 1, uses same part of the code as in parallel
> mode. The code in parallel mode kills hung tests.
> 
> Part of https://github.com/tarantool/test-run/issues/106
> ---
>  branch: https://github.com/tarantool/tarantool/tree/test-switch-ci-to-one-job
In future, could you pls prefix branch name w/ your nick or any other abbrevation
so that your branches are groupped?

--
Regards, Kirill Yukhin

[tarantool-patches] Re: [PATCH] Switch CI test-run to one job

[Kirill Yukhin]

Hello,
On 04 авг 15:31, Sergei Voronezhskii wrote:
> The -j -1 used to legacy consistent mode. Reducing the number of jobs to one
> by switching to -j 1, uses same part of the code as in parallel mode. The code
> in parallel mode kills hung tests.
> 
> Part of https://github.com/tarantool/test-run/issues/106
> ---
>  .travis.mk         | 6 +++---
>  rpm/tarantool.spec | 2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)
I've checked your patch into 1.9 branch.

--
Regards, Kirill Yukhin