From 8119ed0e9e79443e36b143e2bc2eff19194d5af1 Mon Sep 17 00:00:00 2001 From: Silvie Chlupova Date: Apr 26 2022 12:35:21 +0000 Subject: frontend: branch-fedora action should run createrepo for empty chroots too Fixes: #2098 --- diff --git a/frontend/coprs_frontend/commands/rawhide_to_release.py b/frontend/coprs_frontend/commands/rawhide_to_release.py index 97e8d30..b9a9f30 100644 --- a/frontend/coprs_frontend/commands/rawhide_to_release.py +++ b/frontend/coprs_frontend/commands/rawhide_to_release.py @@ -94,6 +94,8 @@ def rawhide_to_release_function(rawhide_chroot, dest_chroot, retry_forked): # no builds to fork in this copr if not len(fork_builds): + print("Createrepo for copr '{}', chroot '{}'".format(copr.full_name, mock_chroot.name)) + actions_logic.ActionsLogic.send_createrepo(copr, chroots=[mock_chroot.name]) continue new_build_chroots = 0 diff --git a/frontend/coprs_frontend/tests/test_commands/test_rawhide_to_release.py b/frontend/coprs_frontend/tests/test_commands/test_rawhide_to_release.py index 8336fd7..2e5e4b6 100644 --- a/frontend/coprs_frontend/tests/test_commands/test_rawhide_to_release.py +++ b/frontend/coprs_frontend/tests/test_commands/test_rawhide_to_release.py @@ -129,30 +129,33 @@ class TestBranchFedora(CoprsTestCase): assert bch.status == StatusEnum("forked") assert bch.build.package == self.p3 - assert self._get_actions() == ["rawhide_to_release"] + assert self._get_actions() == ["rawhide_to_release", "createrepo"] # re-run the command, this is no-op branch_fedora_function(19, False, 'f19') - assert self._get_actions() == ["rawhide_to_release"] + assert self._get_actions() == ["rawhide_to_release", "createrepo", "createrepo"] # re-run, and re-fork all the builds, generates new action branch_fedora_function(19, True, 'f19') - assert self._get_actions() == ["rawhide_to_release", - "rawhide_to_release"] + assert self._get_actions() == ["rawhide_to_release", "createrepo", "createrepo", + "rawhide_to_release", "createrepo"] stdout, _ = capsys.readouterr() assert stdout == "\n".join([ "Handling builds in copr 'user2/barcopr', chroot 'fedora-rawhide-i386'", " Fresh new build chroots: 1, regenerate 0", "Handling builds in copr 'user1/foocopr', chroot 'fedora-rawhide-x86_64'", + "Createrepo for copr 'user1/foocopr', chroot 'fedora-19-x86_64'", "fedora-19-i386 - already exists.", "fedora-19-x86_64 - already exists.", "Handling builds in copr 'user2/barcopr', chroot 'fedora-rawhide-i386'", "Handling builds in copr 'user1/foocopr', chroot 'fedora-rawhide-x86_64'", + "Createrepo for copr 'user1/foocopr', chroot 'fedora-19-x86_64'", "fedora-19-i386 - already exists.", "fedora-19-x86_64 - already exists.", "Handling builds in copr 'user2/barcopr', chroot 'fedora-rawhide-i386'", " Fresh new build chroots: 0, regenerate 1", "Handling builds in copr 'user1/foocopr', chroot 'fedora-rawhide-x86_64'", + "Createrepo for copr 'user1/foocopr', chroot 'fedora-19-x86_64'", "" ])