Skip to content

Dev branches to config 20359 #21539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions .github/config/stable_branches.json

This file was deleted.

11 changes: 11 additions & 0 deletions .github/config/stable_nightly_branches.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[
"main",
"stable-25-1",
"stable-24-4-hotfix",
"stable-25-1-1",
"stable-25-1-analytics",
"stable-25-1-2",
"stable-25-1-3",
"prestable-25-2",
"prestable-25-3"
]
7 changes: 7 additions & 0 deletions .github/config/stable_tests_branches.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[
"main",
"stable-25-1",
"stable-25-1-analytics",
"prestable-25-2",
"prestable-25-3"
]
2 changes: 1 addition & 1 deletion .github/workflows/nightly_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
id: set-branches
run: |
if [[ "${{ github.event_name }}" == "schedule" || ("${{ inputs.use_default_branches }}" == "true" && "${{ github.ref_type }}" != "tag") ]]; then
echo "branches=$(jq -c '.stables_for_nightly' .github/config/stable_branches.json)" >> $GITHUB_OUTPUT
echo "branches=$(jq -c '.' .github/config/stable_nightly_branches.json)" >> $GITHUB_OUTPUT
else
echo "branches=['${{ github.ref_name }}']" >> $GITHUB_OUTPUT
fi
Expand Down
38 changes: 38 additions & 0 deletions .github/workflows/prestable_sync.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Sync prestables
on:
schedule:
- cron: "30 0 * * *" # At 00:30 -- for PR creation
workflow_dispatch:
concurrency:
group: ${{ github.workflow }}
cancel-in-progress: true
env:
GH_TOKEN: ${{ secrets.YDBOT_TOKEN }}
jobs:
create-pr:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
include:
- base_branch: prestable-25-2
head_branch: stable-25-1
label: sync-prestable
- base_branch: prestable-25-3
head_branch: main
label: sync-prestable
steps:
- name: checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
sparse-checkout: |
.github
ydb/ci/
- uses: ./.github/actions/rightlib_sync
with:
base_branch: ${{ matrix.base_branch }}
head_branch: ${{ matrix.head_branch }}
label: ${{ matrix.label }}
repository: ${{ github.repository }}
gh_personal_access_token: ${{ env.GH_TOKEN }}
47 changes: 0 additions & 47 deletions .github/workflows/rebase_prestable.yml

This file was deleted.

3 changes: 1 addition & 2 deletions .github/workflows/regression_run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,5 @@ jobs:
with:
test_targets: ydb/
branches: ''
branches_config_path: '.github/config/stable_branches.json'
branches_config_set: '.stables_for_tests'
branches_config_path: '.github/config/stable_tests_branches.json'
build_preset: ${{ matrix.build_preset }}
3 changes: 1 addition & 2 deletions .github/workflows/regression_run_large.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,5 @@ jobs:
test_targets: ydb/
test_size: large
branches: ''
branches_config_path: '.github/config/stable_branches.json'
branches_config_set: '.stables_for_tests'
branches_config_path: '.github/config/stable_tests_branches.json'
build_preset: ${{ matrix.build_preset }}
3 changes: 1 addition & 2 deletions .github/workflows/regression_run_small_medium.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,5 @@ jobs:
test_targets: ydb/
test_size: small,medium
branches: ''
branches_config_path: '.github/config/stable_branches.json'
branches_config_set: '.stables_for_tests'
branches_config_path: '.github/config/stable_tests_branches.json'
build_preset: ${{ matrix.build_preset }}
3 changes: 1 addition & 2 deletions .github/workflows/regression_run_stress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,5 @@ jobs:
with:
test_targets: ydb/tests/stress/
branches: ''
branches_config_path: '.github/config/stable_branches.json'
branches_config_set: '.stables_for_tests'
branches_config_path: '.github/config/stable_tests_branches.json'
build_preset: ${{ matrix.build_preset }}
3 changes: 1 addition & 2 deletions .github/workflows/regression_whitelist_run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,5 @@ jobs:
with:
test_targets: ydb/tests/sql/ ydb/tests/stress ydb/tests/functional/tpc ydb/tests/functional/benchmarks_init
branches: ''
branches_config_path: '.github/config/stable_branches.json'
branches_config_set: '.stables_for_tests'
branches_config_path: '.github/config/stable_tests_branches.json'
build_preset: ${{ matrix.build_preset }}
19 changes: 3 additions & 16 deletions .github/workflows/rightlib_sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,6 @@ env:
jobs:
create-pr:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
include:
- base_branch: prestable-25-2
head_branch: stable-25-1
label: sync-prestable
- base_branch: prestable-25-3
head_branch: main
label: sync-prestable
- base_branch: main
head_branch: rightlib
label: rightlib
steps:
- name: checkout
uses: actions/checkout@v4
Expand All @@ -34,8 +21,8 @@ jobs:
ydb/ci/
- uses: ./.github/actions/rightlib_sync
with:
base_branch: ${{ matrix.base_branch }}
head_branch: ${{ matrix.head_branch }}
label: ${{ matrix.label }}
base_branch: main
head_branch: rightlib
label: rightlib
repository: ${{ github.repository }}
gh_personal_access_token: ${{ env.GH_TOKEN }}
8 changes: 1 addition & 7 deletions .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@ on:
required: false
type: string
default: ''
branches_config_set:
description: 'Property in file with branches to use'
required: false
type: string
default: ''

workflow_dispatch:
inputs:
Expand Down Expand Up @@ -96,7 +91,6 @@ jobs:
env:
CALLED_BRANCHES: '${{ inputs.branches }}'
BRANCHES_CONFIG_PATH: '${{ inputs.branches_config_path }}'
BRANCHES_CONFIG_SET: '${{ inputs.branches_config_set }}'
run: |
# Проверяем, был ли передан параметр branches из вызывающего workflow
if [[ -n "$CALLED_BRANCHES" ]]; then
Expand All @@ -110,7 +104,7 @@ jobs:
echo "branch_array=[\"$CALLED_BRANCHES\"]" >> $GITHUB_OUTPUT
fi
elif [[ -n "$BRANCHES_CONFIG_PATH" ]]; then
echo "branch_array=$(jq -c "$BRANCHES_CONFIG_SET" "$BRANCHES_CONFIG_PATH")" >> $GITHUB_OUTPUT
echo "branch_array=$(jq -c "." "$BRANCHES_CONFIG_PATH")" >> $GITHUB_OUTPUT
else
# Если ветки не переданы, значит это прямой запуск workflow_dispatch
echo "No branches specified, using current branch: ${{ github.ref_name }}"
Expand Down