add support for maintenance runs

Altinity · Oct 1, 2024 · 65aa954 · 65aa954
1 parent ced0522
commit 65aa954
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml
@@ -93,6 +93,9 @@ env:
   AWS_DEFAULT_REGION: ${{ secrets.AWS_REPORT_REGION }}
   DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
   DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+  CHECKS_DATABASE_HOST: ${{ secrets.CHECKS_DATABASE_HOST }}
+  CHECKS_DATABASE_USER: ${{ secrets.CHECKS_DATABASE_USER }}
+  CHECKS_DATABASE_PASSWORD:  ${{ secrets.CHECKS_DATABASE_PASSWORD }}
   args: --test-to-end
     --no-colors
     --local

diff --git a/.github/workflows/release_branches.yml b/.github/workflows/release_branches.yml
@@ -640,7 +640,7 @@ jobs:
     secrets: inherit
     with:
       runner_type: altinity-on-demand, altinity-type-cpx51, altinity-image-x86-app-docker-ce, altinity-setup-regression
-      commit: 66fff15e3afa278543a6b6ffab9be576e054a921
+      commit: 91b2de501b77cd90ae9345abb7b56e5fa8c1a921
       arch: release 
       build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
 
@@ -650,7 +650,7 @@ jobs:
     secrets: inherit
     with:
       runner_type: altinity-on-demand, altinity-type-cax41, altinity-image-arm-app-docker-ce, altinity-setup-regression
-      commit: 66fff15e3afa278543a6b6ffab9be576e054a921
+      commit: 91b2de501b77cd90ae9345abb7b56e5fa8c1a921
       arch: aarch64
       build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
 

diff --git a/tests/ci/build_check.py b/tests/ci/build_check.py
@@ -13,6 +13,7 @@
 from docker_pull_helper import get_image_with_version
 from env_helper import (
     GITHUB_JOB_API_URL,
+    GITHUB_RUN_ID,
     IMAGES_PATH,
     REPO_COPY,
     S3_ACCESS_KEY_ID,
@@ -184,6 +185,9 @@ def get_release_or_pr(pr_info: PRInfo, version: ClickHouseVersion) -> Tuple[str,
     # It should be fixed in performance-comparison image eventually
     # For performance tests we always set PRs prefix
     performance_pr = "PRs/0"
+    if "commits" not in pr_info.event and "pull_request" not in pr_info.event:
+        # for dispatch maintenance run we use sha and run id
+        return f"maintenance/{pr_info.base_ref}/{GITHUB_RUN_ID}", performance_pr
     if "release" in pr_info.labels or "release-lts" in pr_info.labels:
         # for release pull requests we use branch names prefixes, not pr numbers
         return pr_info.head_ref, performance_pr