From e0dd20dffe93ad29aa99df5aa060672ac72214fa Mon Sep 17 00:00:00 2001 From: Haibo Lin Date: Tue, 19 Nov 2019 12:06:34 +0800 Subject: [PATCH] Prefix repoclosure cache dir with compose id JIRA: COMPOSE-3922 Signed-off-by: Haibo Lin --- pungi/phases/test.py | 8 ++++---- tests/test_test_phase.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pungi/phases/test.py b/pungi/phases/test.py index cf1b8d04..791f3c67 100644 --- a/pungi/phases/test.py +++ b/pungi/phases/test.py @@ -51,7 +51,7 @@ def run_repoclosure(compose): if conf and conf[-1] == 'off': continue - prefix = "repoclosure-%s" % compose.compose_id + prefix = "%s-repoclosure" % compose.compose_id lookaside = {} if variant.parent: repo_id = "%s-%s.%s" % (prefix, variant.parent.uid, arch) @@ -87,12 +87,12 @@ def run_repoclosure(compose): % (variant.uid, arch, exc)) finally: if methods != "hybrid": - _delete_repoclosure_cache_dirs(compose, prefix) + _delete_repoclosure_cache_dirs(compose) compose.log_info("[DONE ] %s" % msg) -def _delete_repoclosure_cache_dirs(compose, prefix): +def _delete_repoclosure_cache_dirs(compose): if 'dnf' == compose.conf["repoclosure_backend"]: from dnf.yum.misc import getCacheDir else: @@ -100,7 +100,7 @@ def _delete_repoclosure_cache_dirs(compose, prefix): top_cache_dir = getCacheDir() for name in os.listdir(top_cache_dir): - if name.startswith(prefix): + if name.startswith(compose.compose_id): cache_path = os.path.join(top_cache_dir, name) if os.path.isdir(cache_path): shutil.rmtree(cache_path) diff --git a/tests/test_test_phase.py b/tests/test_test_phase.py index 6d851a06..6692f3ce 100644 --- a/tests/test_test_phase.py +++ b/tests/test_test_phase.py @@ -304,7 +304,7 @@ class TestRepoclosure(PungiTestCase): def _get_repo(self, compose_id, variant, arch, path=None): path = path or arch + '/os' return { - 'repoclosure-%s-%s.%s' % (compose_id, variant, arch): self.topdir + '/compose/%s/%s' % (variant, path) + '%s-repoclosure-%s.%s' % (compose_id, variant, arch): self.topdir + '/compose/%s/%s' % (variant, path) } @mock.patch('pungi.wrappers.repoclosure.get_repoclosure_cmd')