[copr/copr] 02/02: rpmbuild: do not scrub mock caches

This is an automated email from the git hooks/post-receive script. praiskup pushed a commit to branch master in repository copr/copr. commit eae418de18abfdb1a29295b9feba2b97dc88f2bf Author: Silvie Chlupova <sisi.chlupova(a)gmail.com&gt; AuthorDate: Fri Mar 20 18:09:33 2020 +0100 rpmbuild: do not scrub mock caches This is safe (we can drop the unique 'root' ID) because we can have at most O(N) directories in /var/lib/mock for N enabled chroots for corresponding copr project. That's because builds across different projects don't share the same VMs (VMs and builds belong to sandboxes and each project has different sandbox ID). Each of the /var/lib/mock/<chroot> directories should be small enough, but we still plan to implement #787. Merges: #1316 --- rpmbuild/copr_rpmbuild/builders/mock.py | 1 - rpmbuild/mock.cfg.j2 | 2 -- rpmbuild/tests/test_mock.py | 3 --- 3 files changed, 6 deletions(-) diff --git a/rpmbuild/copr_rpmbuild/builders/mock.py b/rpmbuild/copr_rpmbuild/builders/mock.py index 413399b..294623b 100644 --- a/rpmbuild/copr_rpmbuild/builders/mock.py +++ b/rpmbuild/copr_rpmbuild/builders/mock.py @@ -100,7 +100,6 @@ class MockBuilder(object): """ Do best effort /var/mock/cache cleanup. """ cmd = MOCK_CALL + [ "-r", self.mock_config_file, - "--scrub", "cache", "--scrub", "bootstrap", "--scrub", "chroot", "--quiet", diff --git a/rpmbuild/mock.cfg.j2 b/rpmbuild/mock.cfg.j2 index 1300e59..0301731 100644 --- a/rpmbuild/mock.cfg.j2 +++ b/rpmbuild/mock.cfg.j2 @@ -1,7 +1,5 @@ include('/etc/mock/{{ chroot }}.cfg') -config_opts['root'] = '{{ task_id }}' - {% if buildroot_pkgs %} config_opts['chroot_additional_packages'] = '{{ buildroot_pkgs| join(" ") }}' {% endif %} diff --git a/rpmbuild/tests/test_mock.py b/rpmbuild/tests/test_mock.py index 44001c9..d971e28 100644 --- a/rpmbuild/tests/test_mock.py +++ b/rpmbuild/tests/test_mock.py @@ -121,7 +121,6 @@ class TestMockBuilder(object): code = compile(cfg, "/tmp/foobar", 'exec') exec(code) - assert config_opts["root"] == "10-fedora-24-x86_64" assert config_opts["chroot_additional_packages"] == "pkg1 pkg2 pkg3" assert config_opts["rpmbuild_networking"] assert not config_opts["use_bootstrap"] @@ -140,8 +139,6 @@ class TestMockBuilder(object): assert config == """\ include('/etc/mock/fedora-24-x86_64.cfg') -config_opts['root'] = '10-fedora-24-x86_64' - config_opts['chroot_additional_packages'] = 'pkg1 pkg2 pkg3' -- To stop receiving notification emails like this one, please contact the administrator of this repository.