[Tarantool-patches] [PATCH v1] gitlab-ci: integration testing vshard

[Tarantool-patches] [PATCH v1] gitlab-ci: integration testing vshard

[Oleg Piskunov]

[-- Attachment #1: Type: text/plain, Size: 1713 bytes --]


 
- Adding new stage "integr_test" for integration
  testing connectors and modules with Tarantool.
- Addign module VSHARD for testing in Tarantool
  development cycle.
 
Closes #4972
---
 
Github:  https://github.com/tarantool/tarantool/tree/opiskunov/gh-4972-integration-test-vshard
Issue:  https://github.com/tarantool/tarantool/issues/4972

 .gitlab-ci.yml | 11 +++++++++++
 .travis.mk     | 10 ++++++++++
 2 files changed, 21 insertions(+)
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 256b368..8576f91 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,6 @@
 stages:
   - test
+  - integr_test
   - perf
   - cleanup
 
@@ -183,6 +184,16 @@ freebsd_12_release:
   script:
     - ${GITLAB_MAKE} vms_test_freebsd
 
+# ###################
+# Integration testing
+# ###################
+
+release_module_vshard_test:
+  <<: *docker_test_definition
+  stage: integr_test
+  script:
+    - ${GITLAB_MAKE} test_module_vshard
+
 # ####
 # Perf
 # ####
diff --git a/.travis.mk b/.travis.mk
index 063537f..25e0469 100644
--- a/.travis.mk
+++ b/.travis.mk
@@ -87,6 +87,16 @@ test_debian: deps_debian test_debian_no_deps
 
 test_debian_clang8: deps_debian deps_buster_clang_8 test_debian_no_deps
 
+# Integration testing
+
+test_module_vshard:
+       cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_WERROR=ON -DENABLE_DIST=ON ${CMAKE_EXTRA_PARAMS}
+       make -j
+       make install
+       git clone https://github.com/tarantool/vshard.git tarantool/vshard
+       cd tarantool/vshard && git submodule update --init --recursive \
+               && cmake . && make test
+
 # Debug with coverage
 
 build_coverage_debian:
--
1.8.3.1
 

[-- Attachment #2: Type: text/html, Size: 2534 bytes --]

Re: [Tarantool-patches] [PATCH v1] gitlab-ci: integration testing vshard

[Alexander V. Tikhonov]

Hi Oleg, thanks for the patch. I have some minor style corrections below.

On Sun, May 17, 2020 at 10:35:58AM +0300, Oleg Piskunov wrote:
> 
>  
> - Adding new stage "integr_test" for integration
>   testing connectors and modules with Tarantool.
> - Addign module VSHARD for testing in Tarantool
>   development cycle.
>  
> Closes #4972
> ---
>  
> Github:  https://github.com/tarantool/tarantool/tree/opiskunov/gh-4972-integration-test-vshard
> Issue:  https://github.com/tarantool/tarantool/issues/4972
> 
>  .gitlab-ci.yml | 11 +++++++++++
>  .travis.mk     | 10 ++++++++++
>  2 files changed, 21 insertions(+)
>  
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 256b368..8576f91 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -1,5 +1,6 @@
>  stages:
>    - test
> +  - integr_test
>    - perf
>    - cleanup
>  
> @@ -183,6 +184,16 @@ freebsd_12_release:
>    script:
>      - ${GITLAB_MAKE} vms_test_freebsd
>  
> +# ###################
> +# Integration testing
> +# ###################
> +
> +release_module_vshard_test:
> +  <<: *docker_test_definition
> +  stage: integr_test
> +  script:
> +    - ${GITLAB_MAKE} test_module_vshard
> +
>  # ####
>  # Perf
>  # ####
> diff --git a/.travis.mk b/.travis.mk
> index 063537f..25e0469 100644
> --- a/.travis.mk
> +++ b/.travis.mk
> @@ -87,6 +87,16 @@ test_debian: deps_debian test_debian_no_deps
>  
>  test_debian_clang8: deps_debian deps_buster_clang_8 test_debian_no_deps
>  
> +# Integration testing
> +
> +test_module_vshard:
> +       cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_WERROR=ON -DENABLE_DIST=ON ${CMAKE_EXTRA_PARAMS}
> +       make -j

Here is the Tarantool building and there is already special rule exists
for it, let's use it, like:

test_module_vshard: build_debian

> +       make install
> +       git clone https://github.com/tarantool/vshard.git tarantool/vshard

A little bit confising here, if you want additional directory like
'tarantool' may be it's better to change it to some name like 'module'.

> +       cd tarantool/vshard && git submodule update --init --recursive \
> +               && cmake . && make test

Seems extra 'submodule update' call to git can be merged to its 'clone'
call, like:

git clone --recurse-submodules https://...

> +
>  # Debug with coverage
>  
>  build_coverage_debian:
> --
> 1.8.3.1
>  

Re: [Tarantool-patches] [PATCH v1] gitlab-ci: integration testing vshard

[Sergey Bronnikov]

Hi, Oleg

just a curious - why you didn't add vshard tests to test/ dir in tarantool
to be able to run them using usual test-run.py?

Sergey

On 10:35 Sun 17 May , Oleg Piskunov wrote:
> 
>  
> - Adding new stage "integr_test" for integration
>   testing connectors and modules with Tarantool.
> - Addign module VSHARD for testing in Tarantool
>   development cycle.
>  
> Closes #4972
> ---
>  
> Github:  https://github.com/tarantool/tarantool/tree/opiskunov/gh-4972-integration-test-vshard
> Issue:  https://github.com/tarantool/tarantool/issues/4972
> 
>  .gitlab-ci.yml | 11 +++++++++++
>  .travis.mk     | 10 ++++++++++
>  2 files changed, 21 insertions(+)
>  
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 256b368..8576f91 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -1,5 +1,6 @@
>  stages:
>    - test
> +  - integr_test
>    - perf
>    - cleanup
>  
> @@ -183,6 +184,16 @@ freebsd_12_release:
>    script:
>      - ${GITLAB_MAKE} vms_test_freebsd
>  
> +# ###################
> +# Integration testing
> +# ###################
> +
> +release_module_vshard_test:
> +  <<: *docker_test_definition
> +  stage: integr_test
> +  script:
> +    - ${GITLAB_MAKE} test_module_vshard
> +
>  # ####
>  # Perf
>  # ####
> diff --git a/.travis.mk b/.travis.mk
> index 063537f..25e0469 100644
> --- a/.travis.mk
> +++ b/.travis.mk
> @@ -87,6 +87,16 @@ test_debian: deps_debian test_debian_no_deps
>  
>  test_debian_clang8: deps_debian deps_buster_clang_8 test_debian_no_deps
>  
> +# Integration testing
> +
> +test_module_vshard:
> +       cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_WERROR=ON -DENABLE_DIST=ON ${CMAKE_EXTRA_PARAMS}
> +       make -j
> +       make install
> +       git clone https://github.com/tarantool/vshard.git tarantool/vshard
> +       cd tarantool/vshard && git submodule update --init --recursive \
> +               && cmake . && make test
> +
>  # Debug with coverage
>  
>  build_coverage_debian:
> --
> 1.8.3.1

Re: [Tarantool-patches] [PATCH v1] gitlab-ci: integration testing vshard

[Oleg Piskunov]

[-- Attachment #1: Type: text/plain, Size: 1149 bytes --]



Sasha, thanks for review. Below my comments.
  
>> +test_module_vshard:
>> +       cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_WERROR=ON -DENABLE_DIST=ON ${CMAKE_EXTRA_PARAMS}
>> +       make -j
>
>Here is the Tarantool building and there is already special rule exists
>for it, let's use it, like:
>
>test_module_vshard: build_debian
The reason is that tarantoolctl needed for testing vshard module.
I’ll reuse «build_debian», but will add -DENABLE_DIST=ON option to it for enable
tarantoolctl during «make install».
  
>> +       make install
>> +       git clone  https://github.com/tarantool/vshard.git tarantool/vshard
>
>A little bit confising here, if you want additional directory like
>'tarantool' may be it's better to change it to some name like 'module'.
Sure, will change path to just «vshard»
>> +       cd tarantool/vshard && git submodule update --init --recursive \
>> +               && cmake . && make test
>
>Seems extra 'submodule update' call to git can be merged to its 'clone'
>call, like:
>
>git clone --recurse-submodules  https://...
Sure. Will do.
 
 
 
--
Oleg Piskunov
 

[-- Attachment #2: Type: text/html, Size: 1989 bytes --]

Re: [Tarantool-patches] [PATCH v1] gitlab-ci: integration testing vshard

[Oleg Piskunov]

[-- Attachment #1: Type: text/plain, Size: 510 bytes --]



Sergey, thanks for review. Below my comments.
  
>Понедельник, 18 мая 2020, 12:00 +03:00 от Sergey Bronnikov <sergeyb@tarantool.org>:
> 
>Hi, Oleg
>
>just a curious - why you didn't add vshard tests to test/ dir in tarantool
>to be able to run them using usual test-run.py?
 
The reason that I testing vshard module (installation and testing) using vshard repo and as described in vshard module instruction. Any way, it’s no improvment to do it as you suggested.
 
--
Oleg Piskunov
 

[-- Attachment #2: Type: text/html, Size: 991 bytes --]