mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 14:32:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

makebuildserver: move copy_caches_from_host to command line flag

Browse source
This commit is contained in:
Hans-Christoph Steiner 2022-10-19 10:31:36 +02:00
parent 21ea1c1c89
commit abdd02f33a
No known key found for this signature in database
GPG key ID: 3E177817BA1B9BFA
3 changed files with 3 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
makebuildserver
View file

@ -27,6 +27,8 @@ parser.add_option("-c", "--clean", action="store_true", default=False,
parser.add_option('--skip-cache-update', action="store_true", default=False,
help="""Skip downloading and checking cache."""
"""This assumes that the cache is already downloaded completely.""")
parser.add_option('--copy-caches-from-host', action="store_true", default=False,
help="""Copy gradle and pip caches into the buildserver VM""")
parser.add_option('--keep-box-file', action="store_true", default=False,
help="""Box file will not be deleted after adding it to box storage"""
""" (KVM-only).""")
@ -77,7 +79,6 @@ BASEBOX_CHECKSUMS = {
config = {
'basebox': BASEBOX_DEFAULT,
'debian_mirror': 'https://deb.debian.org/debian/',
'copy_caches_from_host': False,
'boot_timeout': 600,
'cachedir': os.path.join(os.getenv('HOME'), '.cache', 'fdroidserver'),
'cpus': 1,
@ -376,7 +377,7 @@ def main():
logging.error("'vagrant up' failed.")
sys.exit(1)
if config['copy_caches_from_host']:
if options.copy_caches_from_host:
ssh_config = v.ssh_config()
user = re.search(r'User ([^ \n]+)', ssh_config).group(1)
hostname = re.search(r'HostName ([^ \n]+)', ssh_config).group(1)