Regression runs: multi-branch run support + refactoring (#16735)

naspirato · web-flow · commit 4eb3ce84c01c · 2025-04-08T10:48:49.000+02:00
diff --git a/.github/actions/build_and_test_ya/action.yml b/.github/actions/build_and_test_ya/action.yml
@@ -51,6 +51,10 @@ inputs:
   vars:
     type: string
     default: ""
+  custom_branch_name:
+    description: "Custom branch name required when workflow branch != checkout branch"
+    type: string
+    required: false
 defaults:
   run:
     shell: bash
@@ -88,3 +92,4 @@ runs:
         bazel_remote_password: ${{ fromJSON( inputs.secs ).REMOTE_CACHE_PASSWORD || '' }}
         put_build_results_to_cache: ${{ inputs.put_build_results_to_cache }}
         test_retry_count: ${{ inputs.test_retry_count }}
+        custom_branch_name: ${{ inputs.custom_branch_name }}
diff --git a/.github/actions/test_ya/action.yml b/.github/actions/test_ya/action.yml
@@ -60,6 +60,11 @@ inputs:
     type: string
     default: ""
     description: "how many times to retry failed tests"
+  custom_branch_name:
+    description: "Custom branch name required when workflow branch != checkout branch"
+    type: string
+    required: false
+
 outputs:
   success:
     value: ${{ steps.build.outputs.status }}
@@ -271,8 +276,18 @@ runs:
           --cache-size 2TB --force-build-depends
         )
 
+        echo "inputs.custom_branch_name = ${{ inputs.custom_branch_name }}"
+        echo "GITHUB_REF_NAME = $GITHUB_REF_NAME"
+
+        if [ -z "${{ inputs.custom_branch_name }}" ]; then
+          BRANCH_NAME="${GITHUB_REF_NAME}"
+        else
+          BRANCH_NAME="${{ inputs.custom_branch_name }}"
+        fi
+        echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV
+        echo "BRANCH_NAME is set to $BRANCH_NAME"
 
-        TESTMO_BRANCH_TAG="$GITHUB_REF_NAME"
+        TESTMO_BRANCH_TAG="$BRANCH_NAME"
         TESTMO_ARCH="${{ runner.arch == 'X64' && 'x86-64' || runner.arch == 'ARM64' && 'arm64' || 'unknown' }}"
         TESTMO_PR_NUMBER=${{ github.event.number }}
 
@@ -470,7 +485,7 @@ runs:
 
           # upload tests results to YDB
           ydb_upload_run_name="${TESTMO_RUN_NAME// /"_"}"
-          result=`.github/scripts/analytics/upload_tests_results.py --test-results-file ${CURRENT_JUNIT_XML_PATH} --run-timestamp $(date +%s) --commit $(git rev-parse HEAD) --build-type ${BUILD_PRESET} --pull $ydb_upload_run_name --job-name "${{ github.workflow }}" --job-id "${{ github.run_id }}" --branch ${GITHUB_REF_NAME}`
+          result=`.github/scripts/analytics/upload_tests_results.py --test-results-file ${CURRENT_JUNIT_XML_PATH} --run-timestamp $(date +%s) --commit $(git rev-parse HEAD) --build-type ${BUILD_PRESET} --pull $ydb_upload_run_name --job-name "${{ github.workflow }}" --job-id "${{ github.run_id }}" --branch "${BRANCH_NAME}"`
 
           if [ ${{ inputs.testman_token }} ]; then
             # finish testme session
@@ -573,7 +588,7 @@ runs:
             echo file ${file_to_check} NOT changed
         else
             echo file ${file_to_check} changed
-            .github/scripts/tests/get_muted_tests.py --output_folder "$PUBLIC_DIR/mute_info/" get_mute_diff --base_sha $ORIGINAL_HEAD~1 --head_sha $ORIGINAL_HEAD --job-id "${{ github.run_id }}" --branch "${GITHUB_REF_NAME}"
+            .github/scripts/tests/get_muted_tests.py --output_folder "$PUBLIC_DIR/mute_info/" get_mute_diff --base_sha $ORIGINAL_HEAD~1 --head_sha $ORIGINAL_HEAD --job-id "${{ github.run_id }}" --branch "${BRANCH_NAME}"
             FILE_PATH=$PUBLIC_DIR/mute_info/2_new_muted_tests.txt
             SEPARATOR=""
             if [ -f "$FILE_PATH" ]; then
@@ -633,7 +648,7 @@ runs:
       run: |
         set -x
         export build_preset="${{ inputs.build_preset }}"
-        export branch_to_compare="$GITHUB_REF_NAME"
+        export branch_to_compare="$BRANCH_NAME"
         export yellow_treshold=102400
         export red_treshold=2097152
         export commit_git_sha="$(git rev-parse HEAD)"
diff --git a/.github/workflows/regression_run.yml b/.github/workflows/regression_run.yml
@@ -2,8 +2,14 @@ name: Regression-run
 
 on:
   schedule:
-    - cron: "0 23 * * *"  # At 23:00 every day
+    - cron: "55 23 * * *"  # At 23:55 every day
   workflow_dispatch:
+    inputs:
+      use_default_branches:
+        description: 'If true, start main and all current stable branches. If false, start only the selected branch.'
+        type: boolean
+        required: false
+        default: true
 
 jobs:
   main:
@@ -13,8 +19,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix: 
-         build_preset: ["relwithdebinfo", "release-asan", "release-tsan", "release-msan"]
+        build_preset: ["relwithdebinfo", "release-asan", "release-tsan", "release-msan"]
     with:
       test_targets: ydb/
-      build_preset: ${{ matrix.build_preset }}
-
+      branches: ${{ inputs.use_default_branches == true && '["main", "stable-25-1", "stable-25-1-1", "stable-25-1-analytics"]' || github.ref_name }}
+      build_preset: ${{ matrix.build_preset }}
diff --git a/.github/workflows/regression_run_compatibility.yml b/.github/workflows/regression_run_compatibility.yml
@@ -4,6 +4,12 @@ on:
   schedule:
     - cron: "0 23 * * *"  # At 23:00 every day
   workflow_dispatch:
+    inputs:
+      use_default_branches:
+        description: 'If true, start main and all current stable branches. If false, start only the selected branch.'
+        type: boolean
+        required: false
+        default: true
 
 jobs:
   main:
@@ -13,8 +19,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix: 
-         build_preset: ["relwithdebinfo", "release-asan", "release-tsan", "release-msan"]
+        build_preset: ["relwithdebinfo", "release-asan", "release-tsan", "release-msan"]
     with:
       test_targets: ydb/tests/functional/compatibility/
-      build_preset: ${{ matrix.build_preset }}
-
+      branches: ${{ inputs.use_default_branches == true && '["main", "stable-25-1", "stable-25-1-1"]' || github.ref_name }}
+      build_preset: ${{ matrix.build_preset }}
diff --git a/.github/workflows/regression_run_large.yml b/.github/workflows/regression_run_large.yml
@@ -2,8 +2,14 @@ name: Regression-run_Large
 
 on:
   schedule:
-    - cron: "0 23 * * *"  # At 23:00 every day
+    - cron: "30 23 * * *"  # At 23:30 every day
   workflow_dispatch:
+    inputs:
+      use_default_branches:
+        description: 'If true, start main and all current stable branches. If false, start only the selected branch.'
+        type: boolean
+        required: false
+        default: true
 
 jobs:
   main:
@@ -13,9 +19,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix: 
-         build_preset: ["relwithdebinfo", "release-asan", "release-tsan", "release-msan"]
+        build_preset: ["relwithdebinfo", "release-asan", "release-tsan", "release-msan"]
     with:
       test_targets: ydb/
       test_size: large
+      branches: ${{ inputs.use_default_branches == true && '["main", "stable-25-1", "stable-25-1-1"]' || github.ref_name }}
       build_preset: ${{ matrix.build_preset }}
-
diff --git a/.github/workflows/regression_run_small_medium.yml b/.github/workflows/regression_run_small_medium.yml
@@ -2,8 +2,14 @@ name: Regression-run_Small_and_Medium
 
 on:
   schedule:
-    - cron: "0 23 * * *"  # At 23:00 every day
+    - cron: "30 23 * * *"  # At 23:30 every day
   workflow_dispatch:
+    inputs:
+      use_default_branches:
+        description: 'If true, start main and all current stable branches. If false, start only the selected branch.'
+        type: boolean
+        required: false
+        default: true
 
 jobs:
   main:
@@ -13,9 +19,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix: 
-         build_preset: ["relwithdebinfo", "release-asan", "release-tsan", "release-msan"]
+        build_preset: ["relwithdebinfo", "release-asan", "release-tsan", "release-msan"]
     with:
       test_targets: ydb/
       test_size: small,medium
+      branches: ${{ inputs.use_default_branches== true && '["main", "stable-25-1", "stable-25-1-1"]' || github.ref_name }}
       build_preset: ${{ matrix.build_preset }}
-
diff --git a/.github/workflows/regression_whitelist_run.yml b/.github/workflows/regression_whitelist_run.yml
@@ -4,6 +4,12 @@ on:
   schedule:
     - cron: "0 23 * * *"  # At 23:00 every day
   workflow_dispatch:
+    inputs:
+      use_default_branches:
+        description: 'If true, start main and all current stable branches. If false, start only the selected branch.'
+        type: boolean
+        required: false
+        default: true
 
 jobs:
   main:
@@ -12,9 +18,9 @@ jobs:
     secrets: inherit
     strategy:
       fail-fast: false
-      matrix: 
-         build_preset: ["relwithdebinfo", "release-asan", "release-tsan", "release-msan"]
+      matrix:
+        build_preset: ["relwithdebinfo", "release-asan", "release-tsan", "release-msan"]
     with:
       test_targets: ydb/tests/sql/ ydb/tests/stress ydb/tests/functional/tpc ydb/tests/functional/benchmarks_init
-      build_preset: ${{ matrix.build_preset }}
-
+      branches: ${{ inputs.use_default_branches == true && '["main", "stable-25-1", "stable-25-1-1", "stable-25-1-analytics"]' || github.ref_name }}
+      build_preset: ${{ matrix.build_preset }}
diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
@@ -9,35 +9,108 @@ on:
         type: string
         default: self-hosted
       test_targets:
-        description: 'Пути запуска'
+        description: 'Paths to tests for run ,example : ydb/ ydb/tests/func/suite'
         required: true
         type: string
         default: ydb/
       test_type:
-        description: 'Тип тестов'
+        description: 'Test type (unittest,py3test,py2test,pytest)'
         required: false
         type: string
         default: unittest,py3test,py2test,pytest
       test_size:
-        description: 'Размер тестов'
+        description: 'Test size (small,medium,large)'
         required: false
         type: string
         default: small,medium,large
       additional_ya_make_args:
-        description: 'Дополнительные аргументы для ya make'
+        description: 'additional args for ya make'
         required: false
         type: string
-        default: -DDEBUGINFO_LINES_ONLY
+        default: ''
       build_preset:
         description: 'Build preset type'
         required: true
         type: string
-        
+      branches:
+        description: 'Branches to test (JSON array or single branch)'
+        required: false
+        type: string
+        default: '["main"]'
+
+  workflow_dispatch:
+    inputs:
+      runner_label:
+        description: 'Label of the runner to be used'
+        required: false
+        default: self-hosted
+      test_targets:
+        description: 'Paths to tests for run ,example : ydb/ ydb/tests/func/suite'
+        required: true
+        default: ydb/
+      test_type:
+        description: 'Test type (unittest,py3test,py2test,pytest)'
+        required: false
+        default: unittest,py3test,py2test,pytest
+      test_size:
+        description: 'Test size (small,medium,large)'
+        required: false
+        type: choice
+        default: small,medium,large
+        options:
+          - small
+          - medium,
+          - large
+          - small,medium
+          - small,medium,large
+      additional_ya_make_args:
+        description: 'additional args for ya make'
+        required: false
+        default: ''
+      build_preset:
+        description: 'Build preset type (relwithdebinfo, release-asan, release-msan, release-tsan)'
+        required: true
+        type: choice
+        options:
+          - relwithdebinfo
+          - release-asan
+          - release-msan
+          - release-tsan
+        default: relwithdebinfo
+      branches:
+        description: 'Branches to test (JSON array or single branch name)'
+        required: false
+        default: '["main"]'
+
 jobs:
+  prepare:
+    runs-on: ubuntu-latest
+    outputs:
+      branch_array: ${{ steps.set-branches.outputs.branch_array }}
+    steps:
+      - name: Set branches
+        id: set-branches
+        run: |
+          INPUT_BRANCHES='${{ inputs.branches }}'
+          # Check if input is a JSON array
+          if [[ $INPUT_BRANCHES == \[* ]]; then
+            echo "branch_array=$INPUT_BRANCHES" >> $GITHUB_OUTPUT
+          else
+            # If it's a single branch, create a JSON array with one element
+            echo "branch_array=[\"$INPUT_BRANCHES\"]" >> $GITHUB_OUTPUT
+          fi
+          
+          echo "Using branches: $(cat $GITHUB_OUTPUT | grep branch_array | cut -d= -f2)"
+
   run_tests:
-    name: Test ${{ github.ref_name }}:${{ inputs.build_preset }}
+    needs: prepare
+    name: ${{ matrix.branch }}:${{ inputs.build_preset }}
     timeout-minutes: 1200
     runs-on: ${{ inputs.runner_label }}
+    strategy:
+      fail-fast: false
+      matrix:
+        branch: ${{ fromJson(needs.prepare.outputs.branch_array) }}
     steps:
       - name: Set variables based on build_preset
         id: set-vars
@@ -59,11 +132,11 @@ jobs:
             exit 1
           fi
 
-      - name: Checkout
+      - name: Checkout ${{ matrix.branch }}
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.ref_name }}
-      
+          ref: ${{ matrix.branch }}
+
       - name: Setup ssh key for slice 
         uses: webfactory/ssh-agent@v0.9.0
         with:
@@ -74,7 +147,7 @@ jobs:
         with:
           ci_ydb_service_account_key_file_credentials: ${{ secrets.CI_YDB_SERVICE_ACCOUNT_KEY_FILE_CREDENTIALS }}
 
-      - name: Run YDB Tests ${{ github.ref_name }}
+      - name: Run YDB Tests
         timeout-minutes: ${{ fromJson(env.timeout) }}
         uses: ./.github/actions/build_and_test_ya
         with:
@@ -87,9 +160,10 @@ jobs:
           test_size: ${{ inputs.test_size }}
           test_type: ${{ inputs.test_type }}
           test_threads: ${{ fromJson(env.threads_count) }}
+          custom_branch_name: ${{ matrix.branch }}
           put_build_results_to_cache: true
-          additional_ya_make_args: ${{ inputs.additional_ya_make_args }}
+          additional_ya_make_args: -DDEBUGINFO_LINES_ONLY ${{ inputs.additional_ya_make_args }}
           secs: ${{ format('{{"TESTMO_TOKEN2":"{0}","AWS_KEY_ID":"{1}","AWS_KEY_VALUE":"{2}","REMOTE_CACHE_USERNAME":"{3}","REMOTE_CACHE_PASSWORD":"{4}"}}',
             secrets.TESTMO_TOKEN2, secrets.AWS_KEY_ID, secrets.AWS_KEY_VALUE, secrets.REMOTE_CACHE_USERNAME, secrets.REMOTE_CACHE_PASSWORD ) }}
           vars: ${{ format('{{"AWS_BUCKET":"{0}","AWS_ENDPOINT":"{1}","REMOTE_CACHE_URL":"{2}","TESTMO_URL":"{3}","TESTMO_PROJECT_ID":"{4}"}}',
-            vars.AWS_BUCKET, vars.AWS_ENDPOINT, vars.REMOTE_CACHE_URL_YA, vars.TESTMO_URL, vars.TESTMO_PROJECT_ID ) }}
+            vars.AWS_BUCKET, vars.AWS_ENDPOINT, vars.REMOTE_CACHE_URL_YA, vars.TESTMO_URL, vars.TESTMO_PROJECT_ID ) }}
