Add apk package and reports

This commit is contained in:
Mikhail f. Shiryaev 2022-03-21 10:38:44 +01:00
parent bad78f0daa
commit b9cb64a4a1
No known key found for this signature in database
GPG Key ID: 4B02ED204C7D93F4
2 changed files with 5 additions and 2 deletions

View File

@ -205,6 +205,7 @@ def parse_env_variables(
result.append('DISTCC_HOSTS="localhost/`nproc`"')
if additional_pkgs:
result.append("MAKE_APK=true")
result.append("MAKE_RPM=true")
result.append("MAKE_TGZ=true")
@ -337,7 +338,7 @@ if __name__ == "__main__":
ch_root = args.clickhouse_repo_path
if args.additional_pkgs and image_type != "deb":
raise Exception("Can build tgz and rpm packages only in deb build")
raise Exception("Can build additional packages only in deb build")
if args.with_binaries != "" and image_type != "deb":
raise Exception("Can add additional binaries only in deb build")

View File

@ -27,12 +27,14 @@ class BuildResult():
self.with_coverage = with_coverage
def group_by_artifacts(build_urls):
groups = {'deb': [], 'binary': [], 'tgz': [], 'rpm': [], 'performance': []}
groups = {'apk': [],'deb': [], 'binary': [], 'tgz': [], 'rpm': [], 'performance': []}
for url in build_urls:
if url.endswith('performance.tgz'):
groups['performance'].append(url)
elif url.endswith('.deb') or url.endswith('.buildinfo') or url.endswith('.changes') or url.endswith('.tar.gz'):
groups['deb'].append(url)
elif url.endswith('.apk'):
groups['apk'].append(url)
elif url.endswith('.rpm'):
groups['rpm'].append(url)
elif url.endswith('.tgz'):