Environment for integration tests

.github/workflows/pr_check.yaml → .github/workflows/examples.yaml

@@ -1,4 +1,4 @@
-name: PR-check
+name: Examples
 
 on:
   push:
@@ -10,13 +10,17 @@ on:
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
   cancel-in-progress: true
-jobs:
+jobs:      
   main:
-    name: PR check for YDB C++ SDK
+    name: Examples
     runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        ydb-version: [23.3, 24.1, trunk]
     services:
       ydb:
-        image: ydbplatform/local-ydb:latest
+        image: ydbplatform/local-ydb:${{ matrix.ydb-version }}
         ports:
           - 2135:2135
           - 2136:2136
@@ -57,10 +61,6 @@ jobs:
           ubuntu-22.04-ccache-
     - name: Build
       uses: ./.github/actions/build
-    - name: Test
-      shell: bash
-      run: |
-        ctest -j32 --preset release
     - name: Launch basic example
       shell: bash
       run: |

.github/workflows/tests.yaml

@@ -0,0 +1,112 @@
+name: Tests
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+jobs:
+  unit:
+    concurrency:
+      group: unit-${{ github.ref }}-${{ matrix.os }}
+      cancel-in-progress: true
+    strategy:
+      fail-fast: false
+    env:
+      OS: ubuntu-22.04
+    runs-on: ubuntu-22.04
+    steps:
+    - name: Checkout PR
+      uses: actions/checkout@v3
+      if: github.event.pull_request.head.sha != ''
+      with:
+        submodules: true
+        ref: ${{ github.event.pull_request.head.sha }}
+    - name: Checkout
+      uses: actions/checkout@v3
+      if: github.event.pull_request.head.sha == ''
+      with:
+        submodules: true
+    - name: Install dependencies
+      uses: ./.github/actions/prepare_vm
+    - name: Prepare ccache timestamp
+      id: ccache_cache_timestamp
+      shell: cmake -P {0}
+      run: |
+        string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
+        message("::set-output name=timestamp::${current_date}")
+    - name: Restore cache files
+      uses: actions/cache/restore@v4
+      with:
+        path: ~/.ccache
+        key: ubuntu-22.04-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
+        restore-keys: |
+          ubuntu-22.04-ccache-
+    - name: Build
+      uses: ./.github/actions/build
+    - name: Test
+      shell: bash
+      run: |
+        ctest -j32 --preset release-unit
+
+  integration:
+    concurrency:
+      group: integration-${{ github.ref }}-${{ matrix.ydb-version }}
+      cancel-in-progress: true
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        ydb-version: [23.3, 24.1, trunk]
+    services:
+      ydb:
+        image: ydbplatform/local-ydb:${{ matrix.ydb-version }}
+        ports:
+          - 2135:2135
+          - 2136:2136
+          - 8765:8765
+        volumes:
+          - /tmp/ydb_certs:/ydb_certs
+        env:
+          YDB_LOCAL_SURVIVE_RESTART: true
+          YDB_USE_IN_MEMORY_PDISKS: true
+          YDB_TABLE_ENABLE_PREPARED_DDL: true
+        options: '-h localhost'
+    steps:
+    - name: Checkout PR
+      uses: actions/checkout@v3
+      if: github.event.pull_request.head.sha != ''
+      with:
+        submodules: true
+        ref: ${{ github.event.pull_request.head.sha }}
+    - name: Checkout
+      uses: actions/checkout@v3
+      if: github.event.pull_request.head.sha == ''
+      with:
+        submodules: true
+    - name: Install dependencies
+      uses: ./.github/actions/prepare_vm
+    - name: Prepare ccache timestamp
+      id: ccache_cache_timestamp
+      shell: cmake -P {0}
+      run: |
+        string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
+        message("::set-output name=timestamp::${current_date}")
+    - name: Restore cache files
+      uses: actions/cache/restore@v4
+      with:
+        path: ~/.ccache
+        key: ubuntu-22.04-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
+        restore-keys: |
+          ubuntu-22.04-ccache-
+    - name: Build
+      uses: ./.github/actions/build
+    - name: Test
+      shell: bash
+      run: |
+        ctest -j32 --preset release-integration

CMakeLists.txt

@@ -47,7 +47,8 @@ endif()
 
 if (YDB_SDK_TESTS)
   enable_testing()
-  add_subdirectory(tests)
+  add_subdirectory(tests/unit)
+  add_subdirectory(tests/integration)
 endif()
 
 if (YDB_SDK_INSTALL)

CMakePresets.json

@@ -59,6 +59,46 @@
       },
       "execution": {
         "timeout": 1200
+      },
+      "environment": {
+        "YDB_ENDPOINT": "localhost:2136",
+        "YDB_DATABASE": "/local"
+      }
+    },
+    {
+      "name": "release-unit",
+      "configurePreset": "release",
+      "displayName": "Default Unit Release Tests",
+      "filter" : {
+        "include": {
+          "label": "unit"
+        }
+      },
+      "output": {
+        "outputOnFailure": true
+      },
+      "execution": {
+        "timeout": 1200
+      }
+    },
+    {
+      "name": "release-integration",
+      "configurePreset": "release",
+      "displayName": "Default Integration Release Tests",
+      "output": {
+        "outputOnFailure": true
+      },
+      "filter" : {
+        "include": {
+          "label": "integration"
+        }
+      },
+      "execution": {
+        "timeout": 1200
+      },
+      "environment": {
+        "YDB_ENDPOINT": "localhost:2136",
+        "YDB_DATABASE": "/local"
       }
     }
   ]

README.md

@@ -122,6 +122,20 @@ cmake --build --preset release
 
 Specify a level of parallelism by passing the `-j<level>` option into the command below (e.g. `-j$(nproc)`)
 
+Running all tests:
+
 ```bash
 ctest -j$(nproc) --preset release
 ```
+
+Running unit tests only:
+
+```bash
+ctest -j$(nproc) --preset release-unit
+```
+
+Running integration tests only:
+
+```bash
+ctest -j$(nproc) --preset release-integration
+```

cmake/testing.cmake

@@ -60,7 +60,7 @@ endfunction()
 function(add_ydb_test)
   set(opts "")
   set(oneval_args NAME)
-  set(multival_args INCLUDE_DIRS SOURCES LINK_LIBRARIES)
+  set(multival_args INCLUDE_DIRS SOURCES LINK_LIBRARIES LABELS)
   cmake_parse_arguments(YDB_TEST
     "${opts}"
     "${oneval_args}"
@@ -121,6 +121,7 @@ function(add_ydb_test)
     PROPERTY
     LABELS
     MEDIUM
+    ${YDB_TEST_LABELS}
   )
 
   set_yunittest_property(

examples/basic_example/basic_example.cpp

@@ -2,8 +2,6 @@
 
 #include <ydb-cpp-sdk/util/string/cast.h>
 
-#include <src/util/folder/pathsplit.h>
-
 #include <filesystem>
 #include <format>
 

tests/integration/CMakeLists.txt

@@ -0,0 +1 @@
+add_subdirectory(basic_example_it)

tests/integration/basic_example_it/CMakeLists.txt

@@ -0,0 +1,14 @@
+add_ydb_test(NAME basic-example_it
+  SOURCES
+  main.cpp
+  basic_example_data.cpp
+  basic_example.cpp
+  basic_example.h
+  LINK_LIBRARIES
+  yutil
+  YDB-CPP-SDK::Table
+  GTest::gtest_main
+  public-lib-json_value
+  LABELS
+  integration
+)