Skip to content

Commit c7b35ab

Browse files
MyroTkMyroTk
authored
Merge pull request #689 from Altinity/24.8_fix_release_report
24.8 Fix combined report for release and update regression hash
2 parents abce67b + ddb6587 commit c7b35ab

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

‎.github/create_combined_ci_report.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,13 @@ def get_regression_fails(client: Client, job_url: str):
111111
job_name,
112112
report_url as results_link
113113
FROM `gh-data`.clickhouse_regression_results
114-
GROUP BY architecture, test_name, job_url, job_name, report_url, start_time
115-
ORDER BY start_time DESC, length(test_name) DESC
114+
GROUP BY architecture, test_name, job_url, job_name, report_url
115+
ORDER BY length(test_name) DESC
116116
)
117117
WHERE job_url='{job_url}'
118118
AND status IN ('Fail', 'Error')
119119
"""
120+
120121
df = client.query_dataframe(query)
121122
df = drop_prefix_rows(df, "test_name")
122123
df["job_name"] = df["job_name"].str.title()

‎.github/workflows/regression.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ jobs:
179179
python3
180180
-u ${{ env.SUITE }}/regression.py
181181
--clickhouse-binary-path ${{ env.clickhouse_path }}
182-
--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.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
182+
--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)"
183183
${{ env.args }} || EXITCODE=$?;
184184
.github/add_link_to_logs.sh;
185185
exit $EXITCODE
@@ -243,7 +243,7 @@ jobs:
243243
-u alter/regression.py
244244
--clickhouse-binary-path ${{ env.clickhouse_path }}
245245
--only "/alter/${{ matrix.ONLY }} partition/*"
246-
--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.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
246+
--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)"
247247
${{ env.args }} || EXITCODE=$?;
248248
.github/add_link_to_logs.sh;
249249
exit $EXITCODE
@@ -314,7 +314,7 @@ jobs:
314314
--aws-s3-region ${{ secrets.REGRESSION_AWS_S3_REGION }}
315315
--aws-s3-key-id ${{ secrets.REGRESSION_AWS_S3_KEY_ID }}
316316
--aws-s3-access-key ${{ secrets.REGRESSION_AWS_S3_SECRET_ACCESS_KEY }}
317-
--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.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
317+
--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)"
318318
${{ env.args }} || EXITCODE=$?;
319319
.github/add_link_to_logs.sh;
320320
exit $EXITCODE
@@ -374,7 +374,7 @@ jobs:
374374
-u ${{ env.SUITE }}/regression.py
375375
--ssl
376376
--clickhouse-binary-path ${{ env.clickhouse_path }}
377-
--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.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
377+
--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)"
378378
${{ env.args }} || EXITCODE=$?;
379379
.github/add_link_to_logs.sh;
380380
exit $EXITCODE
@@ -436,7 +436,7 @@ jobs:
436436
python3
437437
-u ${{ env.SUITE }}/regression.py
438438
--clickhouse-binary-path ${{ env.clickhouse_path }}
439-
--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.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
439+
--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)"
440440
${{ env.args }} || EXITCODE=$?;
441441
.github/add_link_to_logs.sh;
442442
exit $EXITCODE
@@ -494,7 +494,7 @@ jobs:
494494
python3
495495
-u ${{ env.SUITE }}/regression.py
496496
--clickhouse-binary-path ${{ env.clickhouse_path }}
497-
--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.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
497+
--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)"
498498
${{ env.args }} || EXITCODE=$?;
499499
.github/add_link_to_logs.sh;
500500
exit $EXITCODE
@@ -562,7 +562,7 @@ jobs:
562562
--aws-s3-region ${{ secrets.REGRESSION_AWS_S3_REGION }}
563563
--aws-s3-key-id ${{ secrets.REGRESSION_AWS_S3_KEY_ID }}
564564
--aws-s3-access-key ${{ secrets.REGRESSION_AWS_S3_SECRET_ACCESS_KEY }}
565-
--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.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
565+
--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)"
566566
${{ env.args }} || EXITCODE=$?;
567567
.github/add_link_to_logs.sh;
568568
exit $EXITCODE
@@ -636,7 +636,7 @@ jobs:
636636
--azure-account-name ${{ secrets.AZURE_ACCOUNT_NAME }}
637637
--azure-storage-key ${{ secrets.AZURE_STORAGE_KEY }}
638638
--azure-container ${{ secrets.AZURE_CONTAINER_NAME }}
639-
--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.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
639+
--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)"
640640
${{ env.args }} || EXITCODE=$?;
641641
.github/add_link_to_logs.sh;
642642
exit $EXITCODE
@@ -706,7 +706,7 @@ jobs:
706706
--gcs-key-secret ${{ secrets.REGRESSION_GCS_KEY_SECRET }}
707707
--gcs-uri ${{ secrets.REGRESSION_GCS_URI }}
708708
--with-${{ matrix.STORAGE }}
709-
--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.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
709+
--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)"
710710
${{ env.args }} || EXITCODE=$?;
711711
.github/add_link_to_logs.sh;
712712
exit $EXITCODE

‎.github/workflows/release_branches.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ jobs:
544544
secrets: inherit
545545
with:
546546
runner_type: altinity-on-demand, altinity-type-cpx51, altinity-image-x86-app-docker-ce, altinity-setup-regression
547-
commit: 11dcb1ad771e6afebcb06bcc7bf1c1d8b184d838
547+
commit: bd31e738c0cedaca253d15a05ed245c41b6e0b6a
548548
arch: release
549549
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
550550
timeout_minutes: 300
@@ -555,7 +555,7 @@ jobs:
555555
secrets: inherit
556556
with:
557557
runner_type: altinity-on-demand, altinity-type-cax41, altinity-image-arm-app-docker-ce, altinity-setup-regression
558-
commit: 11dcb1ad771e6afebcb06bcc7bf1c1d8b184d838
558+
commit: bd31e738c0cedaca253d15a05ed245c41b6e0b6a
559559
arch: aarch64
560560
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
561561
timeout_minutes: 300
@@ -638,7 +638,7 @@ jobs:
638638
CHECKS_DATABASE_USER: ${{ secrets.CHECKS_DATABASE_USER }}
639639
CHECKS_DATABASE_PASSWORD: ${{ secrets.CHECKS_DATABASE_PASSWORD }}
640640
COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
641-
PR_NUMBER: ${{ github.event.number }}
641+
PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
642642
ACTIONS_RUN_URL: ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }}
643643
shell: bash
644644
run: |

0 commit comments

Comments
 (0)