Skip to content

Commit 9070f73

Browse files
zvonandzvonand
authored
Merge branch 'antalya-26.1' into backports/antalya-26.1/90825
2 parents b776e18 + c8f5257 commit 9070f73

301 files changed

Lines changed: 11936 additions & 1945 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,38 @@
1212
- Not for changelog (changelog entry is not required)
1313

1414

15-
### Changelog entry (a [user-readable short description](https://github.com/ClickHouse/ClickHouse/blob/master/docs/changelog_entry_guidelines.md) of the changes that goes into CHANGELOG.md):
15+
### Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
1616
...
1717

1818
### Documentation entry for user-facing changes
1919
...
2020

21+
### CI/CD Options
2122
#### Exclude tests:
2223
- [ ] <!---ci_exclude_fast--> Fast test
2324
- [ ] <!---ci_exclude_integration--> Integration Tests
2425
- [ ] <!---ci_exclude_stateless--> Stateless tests
2526
- [ ] <!---ci_exclude_stateful--> Stateful tests
2627
- [ ] <!---ci_exclude_performance--> Performance tests
2728
- [ ] <!---ci_exclude_asan--> All with ASAN
28-
- [ ] <!---ci_exclude_tsan--> All with TSAN
29-
- [ ] <!---ci_exclude_msan--> All with MSAN
30-
- [ ] <!---ci_exclude_ubsan--> All with UBSAN
31-
- [ ] <!---ci_exclude_coverage--> All with Coverage
32-
- [ ] <!---ci_exclude_aarch64--> All with Aarch64
33-
- [ ] <!---ci_exclude_regression--> All Regression
29+
- [x] <!---ci_exclude_tsan--> All with TSAN
30+
- [x] <!---ci_exclude_msan--> All with MSAN
31+
- [x] <!---ci_exclude_ubsan--> All with UBSAN
32+
- [x] <!---ci_exclude_coverage--> All with Coverage
33+
- [ ] <!---ci_exclude_aarch64|arm--> All with Aarch64
34+
- [x] <!---ci_exclude_regression--> All Regression
3435
- [ ] <!---no_ci_cache--> Disable CI Cache
36+
37+
#### Regression jobs to run:
38+
- [ ] <!---ci_regression_common--> Fast suites (mostly <1h)
39+
- [ ] <!---ci_regression_aggregate_functions--> Aggregate Functions (2h)
40+
- [ ] <!---ci_regression_alter--> Alter (1.5h)
41+
- [ ] <!---ci_regression_benchmark--> Benchmark (30m)
42+
- [ ] <!---ci_regression_clickhouse_keeper--> ClickHouse Keeper (1h)
43+
- [ ] <!---ci_regression_iceberg--> Iceberg (2h)
44+
- [ ] <!---ci_regression_ldap--> LDAP (1h)
45+
- [ ] <!---ci_regression_parquet--> Parquet (1.5h)
46+
- [ ] <!---ci_regression_rbac--> RBAC (1.5h)
47+
- [ ] <!---ci_regression_ssl_server--> SSL Server (1h)
48+
- [ ] <!---ci_regression_s3--> S3 (2h)
49+
- [ ] <!---ci_regression_tiered_storage--> Tiered Storage (2h)

‎.github/workflows/backport_branches.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ on:
1616
env:
1717
# Force the stdout and stderr streams to be unbuffered
1818
PYTHONUNBUFFERED: 1
19+
GH_TOKEN: ${{ github.token }}
1920
DISABLE_CI_MERGE_COMMIT: ${{ vars.DISABLE_CI_MERGE_COMMIT || '0' }}
2021
DISABLE_CI_CACHE: ${{ github.event.inputs.no_cache || '0' }}
2122
CHECKOUT_REF: ${{ vars.DISABLE_CI_MERGE_COMMIT == '1' && github.event.pull_request.head.sha || '' }}
@@ -32,10 +33,8 @@ env:
3233
AZURE_CONTAINER_NAME: ${{ secrets.AZURE_CONTAINER_NAME }}
3334
AZURE_STORAGE_ACCOUNT_URL: "https://${{ secrets.AZURE_ACCOUNT_NAME }}.blob.core.windows.net/"
3435
ROBOT_TOKEN: ${{ secrets.ROBOT_TOKEN }}
35-
GH_TOKEN: ${{ github.token }}
3636

37-
# Allow updating GH commit statuses and PR comments to post an actual job reports link
38-
permissions: write-all
37+
3938

4039
jobs:
4140

@@ -60,6 +59,7 @@ jobs:
6059
test_name: "Config Workflow"
6160

6261
- name: Note report location to summary
62+
if: ${{ !failure() && env.AWS_ACCESS_KEY_ID && env.AWS_SECRET_ACCESS_KEY }}
6363
env:
6464
PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
6565
COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}

0 commit comments

Comments
 (0)