Skip to content

Commit fb1850a

Browse files
authored
Merge b8b7851 into 6853d24
2 parents 6853d24 + b8b7851 commit fb1850a

File tree

6 files changed

+27
-15
lines changed

6 files changed

+27
-15
lines changed

Diff for: .github/actions/build_and_test_ya/action.yml

+22-1
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,35 @@ defaults:
6161
runs:
6262
using: "composite"
6363
steps:
64+
- name: Prepare folder prefix
65+
id: prepare_prefix
66+
shell: bash
67+
run: |
68+
# Check if custom_branch_name is set and not empty
69+
if [ -n "${{ inputs.custom_branch_name }}" ]; then
70+
# Extract and sanitize custom_branch_name
71+
CUSTOM_BRANCH_NAME="${{ inputs.custom_branch_name }}"
72+
# Replace all unsupported characters with hyphens
73+
SANITIZED_NAME="${CUSTOM_BRANCH_NAME//[^a-zA-Z0-9-]/-}"
74+
# Optionally limit the length to, say, 50 characters
75+
SANITIZED_NAME="${SANITIZED_NAME:0:50}"
76+
# Assign the sanitized name to the folder_prefix
77+
FOLDER_PREFIX="ya-${SANITIZED_NAME}-"
78+
else
79+
# If the branch name is not provided, use a default prefix
80+
FOLDER_PREFIX='ya-'
81+
fi
82+
# Output the folder_prefix for use in subsequent steps
83+
echo "folder_prefix=${FOLDER_PREFIX}" >> $GITHUB_ENV
84+
6485
- name: Prepare s3cmd
6586
uses: ./.github/actions/s3cmd
6687
with:
6788
s3_bucket: ${{ fromJSON( inputs.vars ).AWS_BUCKET }}
6889
s3_endpoint: ${{ fromJSON( inputs.vars ).AWS_ENDPOINT }}
6990
s3_key_id: ${{ fromJSON( inputs.secs ).AWS_KEY_ID }}
7091
s3_key_secret: ${{ fromJSON( inputs.secs ).AWS_KEY_VALUE }}
71-
folder_prefix: ya-
92+
folder_prefix: ${{ env.folder_prefix }}
7293
build_preset: ${{ inputs.build_preset }}
7394

7495
- name: Run build and tests

Diff for: .github/workflows/regression_run.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ jobs:
2222
build_preset: ["relwithdebinfo", "release-asan", "release-tsan", "release-msan"]
2323
with:
2424
test_targets: ydb/
25-
branches: ${{ inputs.use_default_branches == true && '["main", "stable-25-1", "stable-25-1-1", "stable-25-1-analytics"]' || github.ref_name }}
25+
branches: ${{ (inputs.use_default_branches == true || github.event_name == 'schedule') && '["main", "stable-25-1", "stable-25-1-1", "stable-25-1-analytics"]' || github.ref_name }}
2626
build_preset: ${{ matrix.build_preset }}

Diff for: .github/workflows/regression_run_compatibility.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ jobs:
2222
build_preset: ["relwithdebinfo", "release-asan", "release-tsan", "release-msan"]
2323
with:
2424
test_targets: ydb/tests/functional/compatibility/
25-
branches: ${{ inputs.use_default_branches == true && '["main", "stable-25-1", "stable-25-1-1"]' || github.ref_name }}
25+
branches: ${{ (inputs.use_default_branches == true || github.event_name == 'schedule') && '["main", "stable-25-1", "stable-25-1-1"]' || github.ref_name }}
2626
build_preset: ${{ matrix.build_preset }}

Diff for: .github/workflows/regression_run_large.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ jobs:
2323
with:
2424
test_targets: ydb/
2525
test_size: large
26-
branches: ${{ inputs.use_default_branches == true && '["main", "stable-25-1", "stable-25-1-1"]' || github.ref_name }}
26+
branches: ${{ (inputs.use_default_branches == true || github.event_name == 'schedule') && '["main", "stable-25-1", "stable-25-1-1"]' || github.ref_name }}
2727
build_preset: ${{ matrix.build_preset }}

Diff for: .github/workflows/regression_run_small_medium.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ jobs:
2323
with:
2424
test_targets: ydb/
2525
test_size: small,medium
26-
branches: ${{ inputs.use_default_branches== true && '["main", "stable-25-1", "stable-25-1-1"]' || github.ref_name }}
26+
branches: ${{ (inputs.use_default_branches == true || github.event_name == 'schedule') && '["main", "stable-25-1", "stable-25-1-1"]' || github.ref_name }}
2727
build_preset: ${{ matrix.build_preset }}

Diff for: .github/workflows/run_tests.yml

+1-10
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ name: Run tests
33
on:
44
workflow_call:
55
inputs:
6-
runner_label:
7-
description: 'Label of the runner to be used'
8-
required: false
9-
type: string
10-
default: self-hosted
116
test_targets:
127
description: 'Paths to tests for run ,example : ydb/ ydb/tests/func/suite'
138
required: true
@@ -40,10 +35,6 @@ on:
4035

4136
workflow_dispatch:
4237
inputs:
43-
runner_label:
44-
description: 'Label of the runner to be used'
45-
required: false
46-
default: self-hosted
4738
test_targets:
4839
description: 'Paths to tests for run ,example : ydb/ ydb/tests/func/suite'
4940
required: true
@@ -106,7 +97,7 @@ jobs:
10697
needs: prepare
10798
name: ${{ matrix.branch }}:${{ inputs.build_preset }}
10899
timeout-minutes: 1200
109-
runs-on: ${{ inputs.runner_label }}
100+
runs-on: [ self-hosted, auto-provisioned, "${{ format('build-preset-{0}', inputs.build_preset) }}" ]
110101
strategy:
111102
fail-fast: false
112103
matrix:

0 commit comments

Comments
 (0)