Merge branch 'master' into revert-79898-revert-pushing-to-views

Author: CheSema

README.md

@@ -47,18 +47,21 @@ Please feel free to reach out to tyler `<at>` clickhouse `<dot>` com.
 You can also peruse [ClickHouse Events](https://clickhouse.com/company/news-events) for a list of all upcoming trainings, meetups, speaking engagements, etc.
 
 Upcoming meetups
-* [Austin Meetup](https://www.meetup.com/clickhouse-austin-user-group/events/307289908) - May 13, 2025
 * [London Meetup](https://www.meetup.com/clickhouse-london-user-group/events/306047172/) - May 14, 2025
 * [Istanbul Meetup](https://www.meetup.com/clickhouse-turkiye-meetup-group/events/306978337/) - May 15, 2025
 * [Shenzhen Meetup](https://www.huodongxing.com/event/7803892350511) - May 17, 2025
+* [Belgium Meetup](https://www.meetup.com/clickhouse-belgium-user-group/events/307818346/) - May 20, 2025
 * [Seattle Meetup](https://www.meetup.com/clickhouse-seattle-user-group/events/307622716/) - May 20, 2025
 * [Tokyo Meetup](https://www.meetup.com/clickhouse-tokyo-user-group/events/307689645/) - June 5, 2025
+* [Cyprus Meetup](https://www.meetup.com/clickhouse-cyprus-user-group/events/307819236) - June 10, 2025
 * [Washington DC Meetup](https://www.meetup.com/clickhouse-dc-user-group/events/307622954/) - June 12, 2025
+* [Tel Aviv Meetup](https://www.meetup.com/clickhouse-meetup-israel/events/307820741/) - June 17, 2025
 * [Atlanta Meetup](https://www.meetup.com/clickhouse-atlanta-meetup-group/events/307627590/) - July 8, 2025
 * [New York Meetup](https://www.meetup.com/clickhouse-new-york-user-group/events/307627675/) - July 15, 2025
 
 
 Recent meetups
+* [Austin Meetup](https://www.meetup.com/clickhouse-austin-user-group/events/307289908) - May 13, 2025
 * [Denver Meetup](https://www.meetup.com/clickhouse-denver-user-group/events/306934991/) - April 23, 2025
 * [Jakarta Meetup with AWS](https://www.meetup.com/clickhouse-indonesia-user-group/events/306973747/) - April 22, 2025
 * [Kuala Lumper Meetup with CNCF](https://www.meetup.com/clickhouse-malaysia-meetup-group/events/306697678/) - April 16, 2025

ci/jobs/scripts/check_style/aspell-ignore/en/aspell-dict.txt

@@ -152,6 +152,7 @@ CapContains
 CapUnion
 CapnProto
 CapnProtoEnumComparingMode
+CardSecondary
 CatBoost
 CellAreaM
 CellAreaRads

ci/praktika/info.py

@@ -113,6 +113,10 @@ def is_merge_queue_event(self):
     def is_push_event(self):
         return self.env.EVENT_TYPE == "push"
 
+    @property
+    def is_dispatch_event(self):
+        return self.env.EVENT_TYPE == "dispatch"
+
     @property
     def instance_lifecycle(self):
         return self.env.INSTANCE_LIFE_CYCLE

ci/praktika/job.py

@@ -92,7 +92,7 @@ def parametrize(
                 == len(timeout)
                 == len(provides)
                 == len(requires)
-            ), f"Parametrization lists must be of the same size [{len(parameter)}, {len(runs_on)}, {len(timeout)}, {len(provides)}, {len(requires)}]"
+            ), f"Parametrization lists for job [{self.name}] must be of the same size [{len(parameter)}, {len(runs_on)}, {len(timeout)}, {len(provides)}, {len(requires)}]"
 
             res = []
             for parameter_, runs_on_, timeout_, provides_, requires_ in zip(

ci/praktika/runner.py

@@ -36,7 +36,7 @@ def generate_local_run_environment(workflow, job, pr=None, sha=None):
             BRANCH="branch_name",
             SHA=sha or Shell.get_output("git rev-parse HEAD"),
             PR_NUMBER=pr or -1,
-            EVENT_TYPE="",
+            EVENT_TYPE=workflow.event,
             JOB_OUTPUT_STREAM="",
             EVENT_FILE_PATH="",
             CHANGE_URL="",

ci/praktika/validator.py

@@ -56,7 +56,7 @@ def validate(cls):
             for job in workflow.jobs:
                 cls.evaluate_check(
                     isinstance(job, Job.Config),
-                    f"Invalid job type [{job}]",
+                    f"Invalid job type [{job}]: type [{type(job)}]",
                     workflow.name,
                 )
 
@@ -158,7 +158,7 @@ def validate(cls):
                         artifact.is_s3_artifact()
                     ), f"All artifacts must be of S3 type if enable_cache|enable_html=True, artifact [{artifact.name}], type [{artifact.type}], workflow [{workflow.name}]"
 
-            if workflow.dockers:
+            if workflow.dockers and not workflow.disable_dockers_build:
                 assert (
                     Settings.DOCKERHUB_USERNAME
                 ), f"Settings.DOCKERHUB_USERNAME must be provided if workflow has dockers, workflow [{workflow.name}]"

ci/praktika/workflow.py

@@ -107,3 +107,4 @@ class InputConfig:
             description: str
             is_required: bool
             default_value: str
+            options: Optional[List] = None

ci/praktika/yaml_generator.py

@@ -112,6 +112,14 @@ class Templates:
         default: {DEFAULT_VALUE}\
 """
 
+        TEMPLATE_OPTIONS_INPUT = """
+      {NAME}:
+        description: {DESCRIPTION}
+        type: choice
+        options: {OPTIONS}
+        default: {DEFAULT_VALUE}\
+"""
+
         TEMPLATE_SECRET_CONFIG = """\
       {SECRET_NAME}:
         required: true
@@ -378,12 +386,22 @@ def generate(self):
         # for dispatch workflows only
         dispatch_inputs = ""
         for input_item in self.workflow_config.dispatch_inputs:
-            dispatch_inputs += YamlGenerator.Templates.TEMPLATE_INPUT.format(
-                NAME=input_item.name,
-                DESCRIPTION=input_item.description,
-                IS_REQUIRED="true" if input_item.is_required else "false",
-                DEFAULT_VALUE=input_item.default_value or "''",
-            )
+            if not input_item.options:
+                dispatch_inputs += YamlGenerator.Templates.TEMPLATE_INPUT.format(
+                    NAME=input_item.name,
+                    DESCRIPTION=input_item.description,
+                    IS_REQUIRED="true" if input_item.is_required else "false",
+                    DEFAULT_VALUE=input_item.default_value or "''",
+                )
+            else:
+                dispatch_inputs += (
+                    YamlGenerator.Templates.TEMPLATE_OPTIONS_INPUT.format(
+                        NAME=input_item.name,
+                        DESCRIPTION=input_item.description,
+                        OPTIONS=input_item.options,
+                        DEFAULT_VALUE=input_item.default_value or "''",
+                    )
+                )
 
         if self.workflow_config.event in (
             Workflow.Event.PULL_REQUEST,

docker/keeper/Dockerfile

@@ -38,7 +38,7 @@ RUN arch=${TARGETARCH:-amd64} \
 # lts / testing / prestable / etc
 ARG REPO_CHANNEL="stable"
 ARG REPOSITORY="https://packages.clickhouse.com/tgz/${REPO_CHANNEL}"
-ARG VERSION="25.4.3.22"
+ARG VERSION="25.4.4.25"
 ARG PACKAGES="clickhouse-keeper"
 ARG DIRECT_DOWNLOAD_URLS=""
 

docker/server/Dockerfile.alpine

@@ -35,7 +35,7 @@ RUN arch=${TARGETARCH:-amd64} \
 # lts / testing / prestable / etc
 ARG REPO_CHANNEL="stable"
 ARG REPOSITORY="https://packages.clickhouse.com/tgz/${REPO_CHANNEL}"
-ARG VERSION="25.4.3.22"
+ARG VERSION="25.4.4.25"
 ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
 ARG DIRECT_DOWNLOAD_URLS=""