From f30983368cb0a6baa9b6bdf9bc7036480f496485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20P=C3=B6hn?= Date: Wed, 26 Jun 2019 17:00:01 +0200 Subject: [PATCH] build: rsync buildlogs to /repo --- fdroidserver/common.py | 2 +- tests/common.TestCase | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 535a3f2a..96c7e91f 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -3272,7 +3272,7 @@ def deploy_build_log_with_rsync(appid, vercode, log_content, # TODO: sign compressed log file, if a signing key is configured for webroot in config.get('serverwebroot', []): - dest_path = os.path.join(webroot, "buildlogs") + dest_path = os.path.join(webroot, "repo") if not dest_path.endswith('/'): dest_path += '/' # make sure rsync knows this is a directory cmd = ['rsync', diff --git a/tests/common.TestCase b/tests/common.TestCase index 8930ed65..66d9ef22 100755 --- a/tests/common.TestCase +++ b/tests/common.TestCase @@ -951,8 +951,8 @@ class CommonTest(unittest.TestCase): fdroidserver.common.options.quiet = False fdroidserver.common.config = {} fdroidserver.common.config['serverwebroot'] = [ - 'example.com:/var/www/fdroid/repo/', - 'example.com:/var/www/fdroid/archive/'] + 'example.com:/var/www/fdroid/', + 'example.com:/var/www/fbot/'] fdroidserver.common.config['deploy_process_logs'] = True fdroidserver.common.config['identity_file'] = 'ssh/id_rsa' @@ -969,7 +969,7 @@ class CommonTest(unittest.TestCase): '-e', 'ssh -oBatchMode=yes -oIdentitiesOnly=yes -i ssh/id_rsa', cmd[6], - 'example.com:/var/www/fdroid/repo/buildlogs/'], + 'example.com:/var/www/fdroid/repo/'], cmd) self.assertTrue(cmd[6].endswith('/com.example.app_4711_1.log.gz')) with gzip.open(cmd[6], 'r') as f: @@ -982,7 +982,7 @@ class CommonTest(unittest.TestCase): '-e', 'ssh -oBatchMode=yes -oIdentitiesOnly=yes -i ssh/id_rsa', cmd[6], - 'example.com:/var/www/fdroid/archive/buildlogs/'], + 'example.com:/var/www/fbot/repo/'], cmd) self.assertTrue(cmd[6].endswith('/com.example.app_4711_1.log.gz')) with gzip.open(cmd[6], 'r') as f: