Enable running YDB recipe in OSS

7 files changed, 67 insertions, 4 deletions

diff --git a/ydb/apps/ydb/ut/CMakeLists.linux-aarch64.txt b/ydb/apps/ydb/ut/CMakeLists.linux-aarch64.txt
index e5e9e8448d..7b93fec089 100644
--- a/ydb/apps/ydb/ut/CMakeLists.linux-aarch64.txt
+++ b/ydb/apps/ydb/ut/CMakeLists.linux-aarch64.txt
@@ -36,7 +36,7 @@ set_property(
   ydb-apps-ydb-ut
   PROPERTY
   SPLIT_FACTOR
-  10
+  1
 )
 add_yunittest(
   NAME
diff --git a/ydb/apps/ydb/ut/CMakeLists.linux-x86_64.txt b/ydb/apps/ydb/ut/CMakeLists.linux-x86_64.txt
index ae09a8584d..16b271598b 100644
--- a/ydb/apps/ydb/ut/CMakeLists.linux-x86_64.txt
+++ b/ydb/apps/ydb/ut/CMakeLists.linux-x86_64.txt
@@ -37,7 +37,7 @@ set_property(
   ydb-apps-ydb-ut
   PROPERTY
   SPLIT_FACTOR
-  10
+  1
 )
 add_yunittest(
   NAME
diff --git a/ydb/apps/ydb/ut/run_testpack b/ydb/apps/ydb/ut/run_testpack
new file mode 100755
index 0000000000..a29750cd67
--- /dev/null
+++ b/ydb/apps/ydb/ut/run_testpack
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+set -e
+CTX_DIR=$(mktemp -d)
+echo Working dir: $CTX_DIR
+cd "$CTX_DIR"
+
+# Start server
+$source_root/ydb/public/tools/ydb_recipe/start.sh $CTX_DIR
+
+# Run test
+set +e
+ARCADIA_BUILD_ROOT="$build_root" YDB_CLI_BINARY="ydb/apps/ydb/ydb" \
+YDB_ENDPOINT=$(cat $CTX_DIR/ydb_endpoint.txt) YDB_DATABASE=$(cat $CTX_DIR/ydb_database.txt) \
+$build_root/ydb/apps/ydb/ut/ydb-apps-ydb-ut $*
+code=$?
+if [ $code -gt 0 ];then
+  echo
+  echo "Test execution failed"
+  echo
+fi
+
+# Stop server (removes working dir!)
+$source_root/ydb/public/tools/ydb_recipe/stop.sh $CTX_DIR
+
+# Return result code from test run
+if [ $code -gt 0 ];then
+  exit $code
+fi
diff --git a/ydb/apps/ydb/ut/ya.make b/ydb/apps/ydb/ut/ya.make
index 85c9602b40..6b51dcefc3 100644
--- a/ydb/apps/ydb/ut/ya.make
+++ b/ydb/apps/ydb/ut/ya.make
@@ -1,7 +1,5 @@
 UNITTEST()
 
-FORK_SUBTESTS()
-
 IF (SANDBOXING)
     SIZE(LARGE)
     TAG(ya:fat)
diff --git a/ydb/public/tools/ydb_recipe/start.sh b/ydb/public/tools/ydb_recipe/start.sh
new file mode 100755
index 0000000000..c840546ede
--- /dev/null
+++ b/ydb/public/tools/ydb_recipe/start.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+echo
+echo Starting YDB server
+echo
+
+CTX_DIR=$1
+YDB_DRIVER_BINARY="ydb/apps/ydbd/ydbd" \
+PYTHONPATH=$source_root/ydb/public/sdk/python3:$source_root/library/python/testing/yatest_common:$source_root/library/python/testing:$source_root \
+python3 $source_root/ydb/public/tools/ydb_recipe/__main__.py start --output-dir $CTX_DIR --build-root "$build_root" --ydb-working-dir $CTX_DIR
+code=$?
+if [ $code -gt 0 ];then
+  echo
+  echo "YDB server start failed"
+  echo
+  exit $code
+fi
+
+echo
+echo YDB server started successfully
+echo
+
+
diff --git a/ydb/public/tools/ydb_recipe/stop.sh b/ydb/public/tools/ydb_recipe/stop.sh
new file mode 100755
index 0000000000..f0d5248707
--- /dev/null
+++ b/ydb/public/tools/ydb_recipe/stop.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+echo
+echo Stopping YDB server
+echo
+
+CTX_DIR=$1
+YDB_DRIVER_BINARY="ydb/apps/ydbd/ydbd" \
+PYTHONPATH=$source_root/ydb/public/sdk/python3:$source_root/library/python/testing/yatest_common:$source_root/library/python/testing:$source_root \
+python3 $source_root/ydb/public/tools/ydb_recipe/__main__.py stop --output-dir $CTX_DIR --build-root "$build_root" --ydb-working-dir $CTX_DIR
+
diff --git a/ydb/public/tools/ydb_recipe/ya.make b/ydb/public/tools/ydb_recipe/ya.make
index a730a5d291..80b987485e 100644
--- a/ydb/public/tools/ydb_recipe/ya.make
+++ b/ydb/public/tools/ydb_recipe/ya.make
@@ -12,4 +12,9 @@ PEERDIR(
     ydb/public/tools/lib/cmds
 )
 
+FILES(
+    start.sh
+    stop.sh
+)
+
 END()