From 3b4bb7ffa1b21ee6ae02d8701ad7b6ffb86b87ef Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Aug 16 2018 04:20:16 +0000 Subject: New Pungi expects date in suffix for old compose in order to reuse it. --- diff --git a/server/odcs/server/cache.py b/server/odcs/server/cache.py index 2a64091..019d4c8 100644 --- a/server/odcs/server/cache.py +++ b/server/odcs/server/cache.py @@ -103,7 +103,7 @@ class KojiTagCache(object): log.info("Reusing repodata from old cached compose %s", cached_compose_dir) - compose_dir_name = "odcs-%d-1-cached.n.0" % compose.id + compose_dir_name = "odcs-%d-1-19700101.n.0" % compose.id compose_dir = os.path.join(self.cache_dir, compose_dir_name) if os.path.exists(compose_dir): @@ -115,7 +115,7 @@ class KojiTagCache(object): Cleans-up the configuration done by `reuse_cached`. Should be called once the image depending on cached image is built. """ - compose_dir_name = "odcs-%d-1-cached.n.0" % compose.id + compose_dir_name = "odcs-%d-1-19700101.n.0" % compose.id compose_dir = os.path.join(self.cache_dir, compose_dir_name) if os.path.exists(compose_dir): diff --git a/server/tests/test_cache.py b/server/tests/test_cache.py index 020a156..97bc4e9 100644 --- a/server/tests/test_cache.py +++ b/server/tests/test_cache.py @@ -95,7 +95,7 @@ class TestKojiTagCache(ModelsBaseTest): self.cache.reuse_cached(c) copytree.assert_called_once_with( os.path.join(conf.target_dir, "koji_tag_cache/f26-0--x86_64"), - os.path.join(conf.target_dir, "koji_tag_cache/odcs-1-1-cached.n.0"), + os.path.join(conf.target_dir, "koji_tag_cache/odcs-1-1-19700101.n.0"), symlinks=True) @patch("shutil.copytree")