From 6da51942ebe3e01b3ff2c565e87dc97c3441fc79 Mon Sep 17 00:00:00 2001 From: "Mikhail f. Shiryaev" Date: Mon, 20 Nov 2023 11:57:46 +0100 Subject: [PATCH] Follow up the fix from #44311 --- tests/ci/build_check.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/ci/build_check.py b/tests/ci/build_check.py index 3a20ca846a1..34a5956b777 100644 --- a/tests/ci/build_check.py +++ b/tests/ci/build_check.py @@ -128,18 +128,16 @@ def check_for_success_run( version: ClickHouseVersion, ) -> None: # TODO: Remove after S3 artifacts - # the final empty argument is necessary for distinguish build and build_suffix - logged_prefix = "/".join((S3_BUILDS_BUCKET, s3_prefix, "")) - logging.info("Checking for artifacts in %s", logged_prefix) + logging.info("Checking for artifacts %s in bucket %s", s3_prefix, S3_BUILDS_BUCKET) try: # Performance artifacts are now part of regular build, so we're safe build_results = s3_helper.list_prefix(s3_prefix) except Exception as ex: - logging.info("Got exception while listing %s: %s\nRerun", logged_prefix, ex) + logging.info("Got exception while listing %s: %s\nRerun", s3_prefix, ex) return if build_results is None or len(build_results) == 0: - logging.info("Nothing found in %s, rerun", logged_prefix) + logging.info("Nothing found in %s, rerun", s3_prefix) return logging.info("Some build results found:\n%s", build_results) @@ -254,7 +252,9 @@ def main(): # If this is rerun, then we try to find already created artifacts and just # put them as github actions artifact (result) - check_for_success_run(s3_helper, s3_path_prefix, build_name, version) + # The s3_path_prefix has additional "/" in the end to prevent finding + # e.g. `binary_darwin_aarch64/clickhouse` for `binary_darwin` + check_for_success_run(s3_helper, f"{s3_path_prefix}/", build_name, version) docker_image = get_image_with_version(IMAGES_PATH, IMAGE_NAME) image_version = docker_image.version