Merge branch 'antalya-25.8' into external-contributor-workflow

Author: strtgbb

.github/PULL_REQUEST_TEMPLATE.md

@@ -18,23 +18,38 @@ tests/ci/cancel_and_rerun_workflow_lambda/app.py
 - Not for changelog (changelog entry is not required)
 
 
-### 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):
+### Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
 ...
 
 ### Documentation entry for user-facing changes
 ...
 
+### CI/CD Options
 #### Exclude tests:
 - [ ] <!---ci_exclude_fast--> Fast test
 - [ ] <!---ci_exclude_integration--> Integration Tests
 - [ ] <!---ci_exclude_stateless--> Stateless tests
 - [ ] <!---ci_exclude_stateful--> Stateful tests
 - [ ] <!---ci_exclude_performance--> Performance tests
-- [ ] <!---ci_exclude_asan--> All with ASAN
-- [ ] <!---ci_exclude_tsan--> All with TSAN
-- [ ] <!---ci_exclude_msan--> All with MSAN
-- [ ] <!---ci_exclude_ubsan--> All with UBSAN
-- [ ] <!---ci_exclude_coverage--> All with Coverage
-- [ ] <!---ci_exclude_aarch64--> All with Aarch64
-- [ ] <!---ci_exclude_regression--> All Regression
+- [x] <!---ci_exclude_asan--> All with ASAN
+- [x] <!---ci_exclude_tsan--> All with TSAN
+- [x] <!---ci_exclude_msan--> All with MSAN
+- [x] <!---ci_exclude_ubsan--> All with UBSAN
+- [x] <!---ci_exclude_coverage--> All with Coverage
+- [ ] <!---ci_exclude_aarch64|arm--> All with Aarch64
+- [x] <!---ci_exclude_regression--> All Regression
 - [ ] <!---no_ci_cache--> Disable CI Cache
+
+#### Regression jobs to run:
+- [ ] <!---ci_regression_common--> Fast suites (mostly <1h)
+- [ ] <!---ci_regression_aggregate_functions--> Aggregate Functions (2h)
+- [ ] <!---ci_regression_alter--> Alter (1.5h)
+- [ ] <!---ci_regression_benchmark--> Benchmark (30m)
+- [ ] <!---ci_regression_clickhouse_keeper--> ClickHouse Keeper (1h)
+- [ ] <!---ci_regression_iceberg--> Iceberg (2h)
+- [ ] <!---ci_regression_ldap--> LDAP (1h)
+- [ ] <!---ci_regression_parquet--> Parquet (1.5h)
+- [ ] <!---ci_regression_rbac--> RBAC (1.5h)
+- [ ] <!---ci_regression_ssl_server--> SSL Server (1h)
+- [ ] <!---ci_regression_s3--> S3 (2h)
+- [ ] <!---ci_regression_tiered_storage--> Tiered Storage (2h)

.github/dco.yml

@@ -0,0 +1,17 @@
+# The configuration file must be named `dco.yml` and placed in the `.github` directory in the default branch of the repository.
+#
+# This configuration file is backwards compatible with the *dcoapp/app* (https://github.com/dcoapp/app) configuration file.
+
+# https://github.com/cncf/dco2?#remediation-commits
+allowRemediationCommits:
+  # Allow individual remediation commits
+  # https://github.com/cncf/dco2?#individual
+  individual: true
+  # Allow third-party remediation commits
+  # https://github.com/cncf/dco2?#third-party
+  thirdParty: false
+
+require:
+  # Members are required to sign-off commits
+  # https://github.com/cncf/dco2?#skipping-sign-off-for-organization-members
+  members: false

.github/workflows/README.md

@@ -6,7 +6,14 @@ env:
 
 on: # yamllint disable-line rule:truthy
   workflow_run:
-    workflows: ["PR","PullRequestCI", "ReleaseBranchCI", "DocsCheck", "BackportPR"]
+    workflows:
+      - "PR"
+      - "Community PR"
+      - "PullRequestCI"
+      - "ReleaseBranchCI"
+      - "MasterCI"
+      - "DocsCheck"
+      - "BackportPR"
     types:
       - requested
 jobs:

.github/workflows/cancel.yml

@@ -74,15 +74,15 @@ jobs:
         run: |
           VERSION=$(git describe --tags --abbrev=0 | sed 's/v\([0-9]\+\.[0-9]\+\).*/\1/')
           echo "Detected version: $VERSION"
-          
-          CURRENT_TAG=$(git tag --contains ${{ inputs.current_ref || github.sha }} | sort -r | grep -m 1 'altinity' || echo '')
-          echo "CURRENT_TAG: '$CURRENT_TAG' ${{ inputs.current_ref || github.sha }}"
+
+          CURRENT_TAG=$(git tag --contains ${{ inputs.current_ref || github.sha }} | sort -r | grep -m 1 'altinity')
+          echo "CURRENT_TAG: $CURRENT_TAG ${{ inputs.current_ref || github.sha }}"
           PREVIOUS_TAG_COMMIT=$(git log -1 --until=yesterday --tags=v${VERSION}*.altinity* | grep -Po "(?<=commit ).*")
           PREVIOUS_TAG=$(git tag --contains $PREVIOUS_TAG_COMMIT | sort -r | grep -m 1 'altinity')
-          echo "PREVIOUS_TAG: '$PREVIOUS_TAG' $PREVIOUS_TAG_COMMIT"
+          echo "PREVIOUS_TAG: $PREVIOUS_TAG $PREVIOUS_TAG_COMMIT"
           UPSTREAM_TAG_COMMIT=$(git log -1 --tags=v${VERSION}*-lts | grep -Po "(?<=commit ).*")
           UPSTREAM_TAG=$(git tag --contains $UPSTREAM_TAG_COMMIT | sort -r | grep -m 1 'lts')
-          echo "UPSTREAM_TAG: '$UPSTREAM_TAG' $UPSTREAM_TAG_COMMIT"
+          echo "UPSTREAM_TAG: $UPSTREAM_TAG $UPSTREAM_TAG_COMMIT"
 
           echo "PREVIOUS_TAG=$PREVIOUS_TAG" >> $GITHUB_OUTPUT
           echo "PREVIOUS_TAG_COMMIT=$PREVIOUS_TAG_COMMIT" >> $GITHUB_OUTPUT

.github/workflows/compare_fails.yml

@@ -4179,7 +4179,7 @@ jobs:
     secrets: inherit
     with:
       runner_type: altinity-regression-tester
-      commit: 481dd0f61ec5b22430bfc4106ac30d9abfcf70b7
+      commit: c29da9161a1845fdcdb1d3406ae9d4800da21a84
       arch: x86
       build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       timeout_minutes: 300
@@ -4191,7 +4191,7 @@ jobs:
     secrets: inherit
     with:
       runner_type: altinity-regression-tester-aarch64
-      commit: 481dd0f61ec5b22430bfc4106ac30d9abfcf70b7
+      commit: c29da9161a1845fdcdb1d3406ae9d4800da21a84
       arch: aarch64
       build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       timeout_minutes: 300

.github/workflows/master.yml

@@ -4045,7 +4045,7 @@ jobs:
     secrets: inherit
     with:
       runner_type: altinity-regression-tester
-      commit: 481dd0f61ec5b22430bfc4106ac30d9abfcf70b7
+      commit: c29da9161a1845fdcdb1d3406ae9d4800da21a84
       arch: x86
       build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       timeout_minutes: 300
@@ -4057,7 +4057,7 @@ jobs:
     secrets: inherit
     with:
       runner_type: altinity-regression-tester-aarch64
-      commit: 481dd0f61ec5b22430bfc4106ac30d9abfcf70b7
+      commit: c29da9161a1845fdcdb1d3406ae9d4800da21a84
       arch: aarch64
       build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
       timeout_minutes: 300

.github/workflows/pull_request.yml

@@ -2,7 +2,7 @@ name: Scheduled Altinity Stable Builds
 
 on:
   schedule:
-    - cron: '0 0 * * 6' #Weekly run for stable versions 
+    - cron: '0 0 * * 6' #Weekly run for stable versions
     - cron: '0 0 * * *' #Daily run for antalya versions
   # Make sure that any changes to this file is actually tested with PRs
   pull_request:
@@ -18,8 +18,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: 
-          - antalya
+        branch:
+          - antalya-25.8
     name: ${{ matrix.branch }}
     if: github.event.schedule != '0 0 * * 6'
     runs-on: ubuntu-latest
@@ -32,14 +32,21 @@ jobs:
           -H "Authorization: Bearer ${{ secrets.TOKEN }}" \
           -H "X-GitHub-Api-Version: 2022-11-28" \
           https://api.github.com/repos/Altinity/ClickHouse/actions/workflows/release_branches.yml/dispatches \
-          -d '{"ref":"${{ matrix.branch }}"}'
+          -d '{
+            "ref": "${{ matrix.branch }}",
+            "inputs": {
+              "workflow_name": "Scheduled Runs"
+            }
+          }'
 
   WeeklyRuns:
     strategy:
       fail-fast: false
       matrix:
-        branch: 
+        branch:
+          - customizations/24.3.18
           - customizations/24.8.14
+          - releases/25.3.7
     name: ${{ matrix.branch }}
     if: github.event.schedule != '0 0 * * *'
     runs-on: ubuntu-latest
@@ -52,4 +59,9 @@ jobs:
           -H "Authorization: Bearer ${{ secrets.TOKEN }}" \
           -H "X-GitHub-Api-Version: 2022-11-28" \
           https://api.github.com/repos/Altinity/ClickHouse/actions/workflows/release_branches.yml/dispatches \
-          -d '{"ref":"${{ matrix.branch }}"}'
+          -d '{
+            "ref": "${{ matrix.branch }}",
+            "inputs": {
+              "workflow_name": "Scheduled Runs"
+            }
+          }'