Skip to content

Commit 60f8ad9

Browse files
committed
release cicd: fix s3 path formatting
1 parent 2fd8755 commit 60f8ad9

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

tests/ci/release/extract-package-info.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ def main():
121121

122122
args = parser.parse_args()
123123

124-
s3_base_url = f"s3://{args.artifact_src_bucket}"
125124
folder_time = generate_time(args.folder_time)
126125

127126
run_details = get_run_details(args.workflow_url)
@@ -139,13 +138,13 @@ def main():
139138
repo_prefix = get_repo_prefix(altinity_build_feature)
140139

141140
if pr_number != 0:
142-
artifact_url = f"{s3_base_url}/PRs/{pr_number}/{commit_sha}"
141+
artifact_url = f"PRs/{pr_number}/{commit_sha}"
143142
test_results_url = f"PRs/{pr_number}" if package_version >= version.parse("25.6") else pr_number
144143
elif package_version >= version.parse("25.6"):
145-
artifact_url = f"{s3_base_url}/REFs/{branch_name}/{commit_sha}"
146-
test_results_url = artifact_url
144+
artifact_url = f"REFs/{branch_name}/{commit_sha}"
145+
test_results_url = f"REFs/{branch_name}/{commit_sha}"
147146
else:
148-
artifact_url = f"{s3_base_url}/{package_version.major}.{package_version.minor}/{commit_sha}"
147+
artifact_url = f"{package_version.major}.{package_version.minor}/{commit_sha}"
149148
test_results_url = 0
150149
print(f"Artifact URL: {artifact_url}")
151150

@@ -157,15 +156,15 @@ def main():
157156
set_env_variable("NEEDS_BINARY_PROCESSING", package_version >= version.parse("24"))
158157
set_env_variable("PR_NUMBER", str(pr_number))
159158
set_env_variable("REPO_PREFIX", repo_prefix)
160-
set_env_variable("SRC_URL", artifact_url)
159+
set_env_variable("SRC_URL", f"s3://{args.artifact_src_bucket}/{artifact_url}")
161160
set_env_variable("TEST_RESULTS_SRC", str(test_results_url))
162161

163162
# Validate clickhouse-server amd64 deb file with correct version exists
164163
if package_version >= version.parse("25.6"):
165-
deb_exists = file_exists(f"{artifact_url}/build_amd_release/clickhouse-server_{args.package_version}_amd64.deb")
164+
deb_exists = file_exists(f"https://s3.amazonaws.com/{args.artifact_src_bucket}/{artifact_url}/build_amd_release/clickhouse-server_{args.package_version}_amd64.deb")
166165
set_env_variable("BUILD_DIR", "build_amd_release")
167166
else:
168-
deb_exists = file_exists(f"{artifact_url}/package_release/clickhouse-server_{args.package_version}_amd64.deb")
167+
deb_exists = file_exists(f"https://s3.amazonaws.com/{args.artifact_src_bucket}/{artifact_url}/package_release/clickhouse-server_{args.package_version}_amd64.deb")
169168
set_env_variable("BUILD_DIR", "package_release")
170169

171170
if not deb_exists:

0 commit comments

Comments
 (0)