From e68f5c4c2655fb233b4d05c951859450737691e0 Mon Sep 17 00:00:00 2001
From: Brendan Reilly <breilly@redhat.com>
Date: Apr 02 2020 16:12:13 +0000
Subject: Use repo id instead of latest symlink


Fixes https://pagure.io/fm-orchestrator/issue/1581

---

diff --git a/module_build_service/builder/KojiModuleBuilder.py b/module_build_service/builder/KojiModuleBuilder.py
index 9c89441..504fb65 100644
--- a/module_build_service/builder/KojiModuleBuilder.py
+++ b/module_build_service/builder/KojiModuleBuilder.py
@@ -765,7 +765,9 @@ class KojiModuleBuilder(GenericBuilder):
         Returns URL of repository containing the built artifacts for
         the tag with particular name and architecture.
         """
-        return "%s/%s/latest/%s" % (config.koji_repository_url, tag_name, arch)
+        koji_session = get_session(conf, login=False)
+        repo_info = koji_session.getRepo(tag_name)
+        return "%s/%s/%s/%s" % (config.koji_repository_url, tag_name, str(repo_info['id']), arch)
 
     @validate_koji_tag("tag", post="")
     def _get_tag(self, tag, strict=True):
diff --git a/tests/test_builder/test_koji.py b/tests/test_builder/test_koji.py
index e3b0311..453e92a 100644
--- a/tests/test_builder/test_koji.py
+++ b/tests/test_builder/test_koji.py
@@ -107,16 +107,19 @@ class TestKojiBuilder:
         self.p_read_config.stop()
         events.scheduler.reset()
 
-    def test_tag_to_repo(self):
+    @patch("koji.ClientSession")
+    def test_tag_to_repo(self, ClientSession):
         """ Test that when a repo msg hits us and we have no match,
         that we do nothing gracefully.
         """
+        session = ClientSession.return_value
+        session.getRepo.return_value = {"id": 1234}
         repo = GenericBuilder.tag_to_repo(
             "koji", self.config, "module-base-runtime-0.25-9", "x86_64"
         )
         assert repo == (
             "https://kojipkgs.stg.fedoraproject.org/repos"
-            "/module-base-runtime-0.25-9/latest/x86_64"
+            "/module-base-runtime-0.25-9/1234/x86_64"
         )
 
     def test_recover_orphaned_artifact_when_tagged(self, mock_get_session):
@@ -910,6 +913,14 @@ class TestKojiBuilder:
         builder.koji_session.krb_login.assert_called_once()
 
     @patch("koji.ClientSession")
+    def test_repo_from_tag(self, ClientSession):
+        repo = "https://kojipkgs.stg.fedoraproject.org/repos/tagname/1234/arch"
+        session = ClientSession.return_value
+        session.getRepo.return_value = {"id": 1234}
+        ret = GenericBuilder.backends['koji'].repo_from_tag(self.config, 'tagname', 'arch')
+        assert ret == repo
+
+    @patch("koji.ClientSession")
     def test_get_module_build_arches(self, ClientSession):
         module_build = module_build_service.common.models.ModuleBuild.get_by_id(db_session, 2)
         arches = "x86_64 i686 ppc64le aarch64 s390x"