[Tarantool-patches] [PATCH 1/2] cmake: move jepsen targets under option WITH_JEPSEN

[Tarantool-patches] [PATCH 1/2] cmake: move jepsen targets under option WITH_JEPSEN

[sergeyb]

From: Sergey Bronnikov <sergeyb@tarantool.org>

For running Jepsen tests we need to checkout external repository with tests
source code on a build stage. This behaviour brokes a Tarantool build under
Gentoo. Option WITH_JEPSEN enables targets only when they needed.

Closes #5325
---
 .travis.mk     |  2 +-
 CMakeLists.txt | 46 +++++++++++++++++++++++++---------------------
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/.travis.mk b/.travis.mk
index d8f97ef5c..17523fb86 100644
--- a/.travis.mk
+++ b/.travis.mk
@@ -293,5 +293,5 @@ test_freebsd: deps_freebsd test_freebsd_no_deps
 # ###################
 
 test_jepsen: deps_debian_jepsen
-	cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_WERROR=ON
+	cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_WERROR=ON -DWITH_JEPSEN=ON
 	make jepsen-single
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8850e320..512f50e05 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -164,30 +164,34 @@ add_custom_command(TARGET luacheck
     COMMENT "Perform static analysis of Lua code"
 )
 
-ExternalProject_Add(
-    jepsen-tests
-    GIT_REPOSITORY https://github.com/tarantool/jepsen.tarantool
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND ""
-    INSTALL_COMMAND ""
-    TEST_COMMAND ""
-)
+if (WITH_JEPSEN)
+    ExternalProject_Add(
+        jepsen-tests
+        GIT_REPOSITORY https://github.com/tarantool/jepsen.tarantool
+        CONFIGURE_COMMAND ""
+        BUILD_COMMAND ""
+        INSTALL_COMMAND ""
+        TEST_COMMAND ""
+    )
 
-#
-# Enable 'make jepsen-*' targets.
-#
+    #
+    # Enable 'make jepsen-*' targets.
+    #
 
-add_custom_target(jepsen-single DEPENDS jepsen-tests)
-add_custom_command(TARGET jepsen-single
-    COMMAND ${BASH} ${PROJECT_SOURCE_DIR}/tools/run-jepsen-tests.sh ${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR}
-    COMMENT "Running Jepsen tests on a single Tarantool instance"
-)
+    add_custom_target(jepsen-single DEPENDS jepsen-tests)
+    add_custom_command(TARGET jepsen-single
+        COMMAND ${BASH} ${PROJECT_SOURCE_DIR}/tools/run-jepsen-tests.sh
+				${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR}
+        COMMENT "Running Jepsen tests on a single Tarantool instance"
+    )
 
-add_custom_target(jepsen-cluster DEPENDS jepsen-tests)
-add_custom_command(TARGET jepsen-cluster
-    COMMAND ${BASH} ${PROJECT_SOURCE_DIR}/tools/run-jepsen-tests.sh ${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR} 5
-    COMMENT "Running Jepsen tests on a cluster with 5 Tarantool instances"
-)
+    add_custom_target(jepsen-cluster DEPENDS jepsen-tests)
+    add_custom_command(TARGET jepsen-cluster
+        COMMAND ${BASH} ${PROJECT_SOURCE_DIR}/tools/run-jepsen-tests.sh
+				${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR} 5
+        COMMENT "Running Jepsen tests on a cluster with 5 Tarantool instances"
+    )
+endif()
 
 #
 # Get version
-- 
2.25.1

[Tarantool-patches] [PATCH 2/2] gitignore: ignore directories made on running jepsen tests

[sergeyb]

From: Sergey Bronnikov <sergeyb@tarantool.org>

On running Jepsen tests created directory with Terraform state and directory
with Jepsen tests source code in a build directory. Everything is ok on using
out of source build in a separate directory, but with building in a project
root directory these directories appears in `git status` output. This patch add
ignores for these directories.
---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index c6e261e18..d5531419d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -144,6 +144,10 @@ sftpscript.txt
 *.md5sum
 extra/deploy_key
 compile_commands.json
+jepsen-tests-prefix
+.terraform
+terraform.tfstate
+terraform.tfstate.backup
 
 # autogenerated files
 src/box/sql/keywordhash.h
-- 
2.25.1

Re: [Tarantool-patches] [PATCH 2/2] gitignore: ignore directories made on running jepsen tests

[Alexander V. Tikhonov]

Hi Sergey, thanks for the patch. Patch only for git side, LGTM.

On Thu, Sep 24, 2020 at 03:50:24PM +0300, sergeyb@tarantool.org wrote:
> From: Sergey Bronnikov <sergeyb@tarantool.org>
> 
> On running Jepsen tests created directory with Terraform state and directory
> with Jepsen tests source code in a build directory. Everything is ok on using
> out of source build in a separate directory, but with building in a project
> root directory these directories appears in `git status` output. This patch add
> ignores for these directories.
> ---
>  .gitignore | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/.gitignore b/.gitignore
> index c6e261e18..d5531419d 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -144,6 +144,10 @@ sftpscript.txt
>  *.md5sum
>  extra/deploy_key
>  compile_commands.json
> +jepsen-tests-prefix
> +.terraform
> +terraform.tfstate
> +terraform.tfstate.backup
>  
>  # autogenerated files
>  src/box/sql/keywordhash.h
> -- 
> 2.25.1
> 

Re: [Tarantool-patches] [PATCH 1/2] cmake: move jepsen targets under option WITH_JEPSEN

[Alexander V. Tikhonov]

Hi Sergey, thanks for the patch. As I see you blocked all the Jepsen
part in cmake targets under the Jepsen's environment variable. And
now only using it the Jepsen's repository will be used. So patch LGTM.

On Thu, Sep 24, 2020 at 03:50:22PM +0300, sergeyb@tarantool.org wrote:
> From: Sergey Bronnikov <sergeyb@tarantool.org>
> 
> For running Jepsen tests we need to checkout external repository with tests
> source code on a build stage. This behaviour brokes a Tarantool build under
> Gentoo. Option WITH_JEPSEN enables targets only when they needed.
> 
> Closes #5325
> ---
>  .travis.mk     |  2 +-
>  CMakeLists.txt | 46 +++++++++++++++++++++++++---------------------
>  2 files changed, 26 insertions(+), 22 deletions(-)
> 
> diff --git a/.travis.mk b/.travis.mk
> index d8f97ef5c..17523fb86 100644
> --- a/.travis.mk
> +++ b/.travis.mk
> @@ -293,5 +293,5 @@ test_freebsd: deps_freebsd test_freebsd_no_deps
>  # ###################
>  
>  test_jepsen: deps_debian_jepsen
> -	cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_WERROR=ON
> +	cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_WERROR=ON -DWITH_JEPSEN=ON
>  	make jepsen-single
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index e8850e320..512f50e05 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -164,30 +164,34 @@ add_custom_command(TARGET luacheck
>      COMMENT "Perform static analysis of Lua code"
>  )
>  
> -ExternalProject_Add(
> -    jepsen-tests
> -    GIT_REPOSITORY https://github.com/tarantool/jepsen.tarantool
> -    CONFIGURE_COMMAND ""
> -    BUILD_COMMAND ""
> -    INSTALL_COMMAND ""
> -    TEST_COMMAND ""
> -)
> +if (WITH_JEPSEN)
> +    ExternalProject_Add(
> +        jepsen-tests
> +        GIT_REPOSITORY https://github.com/tarantool/jepsen.tarantool
> +        CONFIGURE_COMMAND ""
> +        BUILD_COMMAND ""
> +        INSTALL_COMMAND ""
> +        TEST_COMMAND ""
> +    )
>  
> -#
> -# Enable 'make jepsen-*' targets.
> -#
> +    #
> +    # Enable 'make jepsen-*' targets.
> +    #
>  
> -add_custom_target(jepsen-single DEPENDS jepsen-tests)
> -add_custom_command(TARGET jepsen-single
> -    COMMAND ${BASH} ${PROJECT_SOURCE_DIR}/tools/run-jepsen-tests.sh ${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR}
> -    COMMENT "Running Jepsen tests on a single Tarantool instance"
> -)
> +    add_custom_target(jepsen-single DEPENDS jepsen-tests)
> +    add_custom_command(TARGET jepsen-single
> +        COMMAND ${BASH} ${PROJECT_SOURCE_DIR}/tools/run-jepsen-tests.sh
> +				${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR}
> +        COMMENT "Running Jepsen tests on a single Tarantool instance"
> +    )
>  
> -add_custom_target(jepsen-cluster DEPENDS jepsen-tests)
> -add_custom_command(TARGET jepsen-cluster
> -    COMMAND ${BASH} ${PROJECT_SOURCE_DIR}/tools/run-jepsen-tests.sh ${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR} 5
> -    COMMENT "Running Jepsen tests on a cluster with 5 Tarantool instances"
> -)
> +    add_custom_target(jepsen-cluster DEPENDS jepsen-tests)
> +    add_custom_command(TARGET jepsen-cluster
> +        COMMAND ${BASH} ${PROJECT_SOURCE_DIR}/tools/run-jepsen-tests.sh
> +				${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR} 5
> +        COMMENT "Running Jepsen tests on a cluster with 5 Tarantool instances"
> +    )
> +endif()
>  
>  #
>  # Get version
> -- 
> 2.25.1
> 

Re: [Tarantool-patches] [PATCH 2/2] gitignore: ignore directories made on running jepsen tests

[Kirill Yukhin]

Hello,

On 24 сен 15:50, sergeyb@tarantool.org wrote:
> From: Sergey Bronnikov <sergeyb@tarantool.org>
> 
> On running Jepsen tests created directory with Terraform state and directory
> with Jepsen tests source code in a build directory. Everything is ok on using
> out of source build in a separate directory, but with building in a project
> root directory these directories appears in `git status` output. This patch add
> ignores for these directories.
> ---
>  .gitignore | 4 ++++
>  1 file changed, 4 insertions(+)

I've checked both patches into master.
In future please mention branch name in the letter.

--
Regards, Kirill Yukhin