Skip to content

Commit 43c44af

Browse files
committed
add split keeper suites
1 parent 4ff2e71 commit 43c44af

File tree

1 file changed

+18
-8
lines changed

1 file changed

+18
-8
lines changed

.github/workflows/regression.yml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ jobs:
149149
strategy:
150150
fail-fast: false
151151
matrix:
152-
SUITE: [aes_encryption, atomic_insert, base_58, clickhouse_keeper, data_types, datetime64_extended_range, disk_level_encryption, dns, engines, example, extended_precision_data_types, kafka, kerberos, key_value, lightweight_delete, memory, part_moves_between_shards, rbac, selects, session_timezone, ssl_server, swarms, tiered_storage, version, window_functions]
152+
SUITE: [aes_encryption, atomic_insert, base_58, data_types, datetime64_extended_range, disk_level_encryption, dns, engines, example, extended_precision_data_types, kafka, kerberos, key_value, lightweight_delete, memory, part_moves_between_shards, rbac, selects, session_timezone, ssl_server, swarms, tiered_storage, version, window_functions]
153153
needs: [runner_labels_setup]
154154
runs-on: ${{ fromJson(needs.runner_labels_setup.outputs.runner_labels) }}
155155
timeout-minutes: ${{ inputs.timeout_minutes }}
@@ -413,7 +413,12 @@ jobs:
413413
name: benchmark-${{ matrix.STORAGE }}-${{ inputs.arch }}-artifacts
414414
path: ${{ env.artifact_paths }}
415415

416-
ClickHouseKeeperSSL:
416+
ClickHouseKeeper:
417+
strategy:
418+
fail-fast: false
419+
matrix:
420+
PART: [1, 2]
421+
SSL: [ssl, no_ssl]
417422
needs: [runner_labels_setup]
418423
runs-on: ${{ fromJson(needs.runner_labels_setup.outputs.runner_labels) }}
419424
timeout-minutes: ${{ inputs.timeout_minutes }}
@@ -428,7 +433,12 @@ jobs:
428433
cat >> "$GITHUB_ENV" << 'EOF'
429434
REPORTS_PATH=${{runner.temp}}/reports_dir
430435
SUITE=clickhouse_keeper
431-
STORAGE=/ssl
436+
STORAGE=/${{ matrix.PART }}/${{ matrix.SSL }}
437+
if [ "${{ matrix.SSL }}" = "ssl" ]; then
438+
SSL="--ssl";
439+
else
440+
SSL="";
441+
fi
432442
EOF
433443
- name: Setup
434444
run: .github/setup.sh
@@ -448,10 +458,10 @@ jobs:
448458
id: run_suite
449459
run: EXITCODE=0;
450460
python3
451-
-u ${{ env.SUITE }}/regression.py
452-
--ssl
461+
-u ${{ env.SUITE }}/regression.py $SSL
453462
--clickhouse-binary-path ${{ env.clickhouse_path }}
454-
--attr project="$GITHUB_REPOSITORY" project.id="$GITHUB_REPOSITORY_ID" package="${{ env.clickhouse_path }}" version="${{ env.version }}" user.name="$GITHUB_ACTOR" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name=$GITHUB_JOB job.retry=$GITHUB_RUN_ATTEMPT job.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
463+
--attr project="$GITHUB_REPOSITORY" project.id="$GITHUB_REPOSITORY_ID" package="${{ env.clickhouse_path }}" version="${{ env.version }}" user.name="$GITHUB_ACTOR" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name="$GITHUB_JOB (${{ matrix.PART }}, ${{ matrix.SSL }})" job.retry=$GITHUB_RUN_ATTEMPT job.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
464+
--only "part ${{ matrix.PART }}/*"
455465
${{ env.args }} || EXITCODE=$?;
456466
.github/add_link_to_logs.sh;
457467
exit $EXITCODE
@@ -461,7 +471,7 @@ jobs:
461471
env:
462472
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
463473
JOB_OUTCOME: ${{ steps.run_suite.outcome }}
464-
SUITE_NAME: "Regression ${{ inputs.arch }} Clickhouse Keeper SSL"
474+
SUITE_NAME: "Regression ${{ inputs.arch }} Clickhouse Keeper ${{ matrix.SSL }} ${{ matrix.PART }}"
465475
- name: Create and upload logs
466476
if: always()
467477
run: .github/create_and_upload_logs.sh 1
@@ -472,7 +482,7 @@ jobs:
472482
- uses: actions/upload-artifact@v4
473483
if: always()
474484
with:
475-
name: ${{ env.SUITE }}-${{ inputs.arch }}-ssl-artifacts
485+
name: ${{ env.SUITE }}-${{ matrix.PART }}-${{ inputs.arch }}-${{ matrix.SSL }}-artifacts
476486
path: ${{ env.artifact_paths }}
477487

478488
Iceberg:

0 commit comments

Comments
 (0)