thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-10 09:32:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename alien arguments and parameters

Browse Source
This commit is contained in:
Mikhail f. Shiryaev 2022-03-14 22:06:53 +01:00
parent a04b7fc0a8
commit 0dd1f4af76
No known key found for this signature in database
GPG Key ID: 4B02ED204C7D93F4
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker/packager/packager
View File

@ -83,7 +83,7 @@ def parse_env_variables(
version, version,
author, author,
official, official,
alien_pkgs, additional_pkgs,
with_coverage, with_coverage,
with_binaries, with_binaries,
): ):
@ -204,7 +204,7 @@ def parse_env_variables(
elif cache == "distcc": elif cache == "distcc":
result.append('DISTCC_HOSTS="localhost/`nproc`"') result.append('DISTCC_HOSTS="localhost/`nproc`"')
if alien_pkgs: if additional_pkgs:
result.append("MAKE_RPM=true") result.append("MAKE_RPM=true")
result.append("MAKE_TGZ=true") result.append("MAKE_TGZ=true")
@ -315,7 +315,7 @@ if __name__ == "__main__":
parser.add_argument("--version") parser.add_argument("--version")
parser.add_argument("--author", default="clickhouse", help="a package author") parser.add_argument("--author", default="clickhouse", help="a package author")
parser.add_argument("--official", action="store_true") parser.add_argument("--official", action="store_true")
parser.add_argument("--alien-pkgs", nargs="+", default=[]) parser.add_argument("--additional-pkgs", action="store_true")
parser.add_argument("--with-coverage", action="store_true") parser.add_argument("--with-coverage", action="store_true")
parser.add_argument( parser.add_argument(
"--with-binaries", choices=("programs", "tests", ""), default="" "--with-binaries", choices=("programs", "tests", ""), default=""
@ -336,8 +336,8 @@ if __name__ == "__main__":
else: else:
ch_root = args.clickhouse_repo_path ch_root = args.clickhouse_repo_path
if args.alien_pkgs and image_type != "deb": if args.additional_pkgs and image_type != "deb":
raise Exception("Can add alien packages only in deb build") raise Exception("Can build tgz and rpm packages only in deb build")
if args.with_binaries != "" and image_type != "deb": if args.with_binaries != "" and image_type != "deb":
raise Exception("Can add additional binaries only in deb build") raise Exception("Can add additional binaries only in deb build")
@ -367,7 +367,7 @@ if __name__ == "__main__":
args.version, args.version,
args.author, args.author,
args.official, args.official,
args.alien_pkgs, args.additional_pkgs,
args.with_coverage, args.with_coverage,
args.with_binaries, args.with_binaries,
) )

4
tests/ci/build_check.py
View File

@ -75,9 +75,9 @@ def get_packager_cmd(
cmd += " --cache=ccache" cmd += " --cache=ccache"
cmd += " --ccache_dir={}".format(ccache_path) cmd += " --ccache_dir={}".format(ccache_path)
if "alien_pkgs" in build_config and build_config["alien_pkgs"]: if "additional_pkgs" in build_config and build_config["additional_pkgs"]:
if pr_info.number == 0 or "release" in pr_info.labels: if pr_info.number == 0 or "release" in pr_info.labels:
cmd += " --alien-pkgs rpm tgz" cmd += " --additional-pkgs"
cmd += " --docker-image-version={}".format(image_version) cmd += " --docker-image-version={}".format(image_version)
cmd += " --version={}".format(build_version) cmd += " --version={}".format(build_version)

4
tests/ci/ci_config.py
View File

@ -14,7 +14,7 @@ CI_CONFIG = {
"package_type": "deb", "package_type": "deb",
"bundled": "bundled", "bundled": "bundled",
"splitted": "unsplitted", "splitted": "unsplitted",
"alien_pkgs": True, "additional_pkgs": True,
"tidy": "disable", "tidy": "disable",
"with_coverage": False, "with_coverage": False,
}, },
@ -45,7 +45,7 @@ CI_CONFIG = {
"package_type": "deb", "package_type": "deb",
"bundled": "bundled", "bundled": "bundled",
"splitted": "unsplitted", "splitted": "unsplitted",
"alien_pkgs": True, "additional_pkgs": True,
"tidy": "disable", "tidy": "disable",
"with_coverage": False, "with_coverage": False,
}, },