From 8980994faacbc806a9ed1bd3a76c7321132fd270 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Wed, 30 Mar 2022 16:29:13 +0200
Subject: [PATCH 1/2] Resurrect build hash

---
 tests/ci/build_check.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/ci/build_check.py b/tests/ci/build_check.py
index 24af9e5194c..eb2aa616383 100644
--- a/tests/ci/build_check.py
+++ b/tests/ci/build_check.py
@@ -54,6 +54,7 @@ def get_packager_cmd(
     build_version: str,
     image_version: str,
     ccache_path: str,
+    official: bool,
 ) -> str:
     package_type = build_config["package_type"]
     comp = build_config["compiler"]
@@ -83,6 +84,9 @@ def get_packager_cmd(
     if _can_export_binaries(build_config):
         cmd += " --with-binaries=tests"
 
+    if official:
+        cmd += " --official"
+
     return cmd
 
 
@@ -254,9 +258,11 @@ def main():
 
     logging.info("Got version from repo %s", version.string)
 
+    official_flag = pr_info.number == 0
     version_type = "testing"
     if "release" in pr_info.labels or "release-lts" in pr_info.labels:
         version_type = "stable"
+        official_flag = True
 
     update_version_local(REPO_COPY, version, version_type)
 
@@ -290,7 +296,9 @@ def main():
         version.string,
         image_version,
         ccache_path,
+        official=official_flag
     )
+
     logging.info("Going to run packager with %s", packager_cmd)
 
     build_clickhouse_log = os.path.join(TEMP_PATH, "build_log")

From fcd4e0be654159e34f61d7c4f95f123ba9b6c67c Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Wed, 30 Mar 2022 19:15:27 +0200
Subject: [PATCH 2/2] Black

---
 tests/ci/build_check.py       | 2 +-
 tests/ci/clickhouse_helper.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/ci/build_check.py b/tests/ci/build_check.py
index eb2aa616383..2a079a60367 100644
--- a/tests/ci/build_check.py
+++ b/tests/ci/build_check.py
@@ -296,7 +296,7 @@ def main():
         version.string,
         image_version,
         ccache_path,
-        official=official_flag
+        official=official_flag,
     )
 
     logging.info("Going to run packager with %s", packager_cmd)
diff --git a/tests/ci/clickhouse_helper.py b/tests/ci/clickhouse_helper.py
index 218aaca8b91..d52b6262a78 100644
--- a/tests/ci/clickhouse_helper.py
+++ b/tests/ci/clickhouse_helper.py
@@ -15,7 +15,7 @@ class ClickHouseHelper:
         self.url = url
         self.auth = {
             "X-ClickHouse-User": get_parameter_from_ssm("clickhouse-test-stat-login"),
-            "X-ClickHouse-Key": get_parameter_from_ssm("clickhouse-test-stat-password")
+            "X-ClickHouse-Key": get_parameter_from_ssm("clickhouse-test-stat-password"),
         }
 
     @staticmethod