From 0fbe160af038c5194b7d78fdc9c9571301fe5a30 Mon Sep 17 00:00:00 2001
From: Lubos Kocman <lkocman@redhat.com>
Date: Wed, 20 Jul 2016 19:42:30 +0200
Subject: [PATCH] waiting for right task_id, cleanup of code

---
 rida.conf                              |  6 +++---
 rida/scheduler/handlers/modules.py     | 11 ++++++++---
 submit-build.json                      |  2 +-
 tests/test_scheduler/test_repo_done.py |  1 +
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/rida.conf b/rida.conf
index d1ea9a31..dd332951 100644
--- a/rida.conf
+++ b/rida.conf
@@ -1,12 +1,12 @@
 [DEFAULT]
 system = koji
 messaging = fedmsg
-koji_config = ~/.koji/config
+koji_config = /etc/rida/koji.conf
 # See https://fedoraproject.org/wiki/Koji/WritingKojiCode#Profiles
-koji_profile = staging
+koji_profile = koji
 koji_arches = ["x86_64"]
 db = sqlite:///rida.db
-pdc_url = http://modularity.fedorainfracloud.org:8080/rest_api/v1
+pdc_url = http://modularity.fedorainfracloud.org:8080/rest_api/v1/
 pdc_insecure = True
 pdc_develop = True
 scmurls = ["git://pkgs.stg.fedoraproject.org/modules/"]
diff --git a/rida/scheduler/handlers/modules.py b/rida/scheduler/handlers/modules.py
index e506234f..a8e8a25b 100644
--- a/rida/scheduler/handlers/modules.py
+++ b/rida/scheduler/handlers/modules.py
@@ -29,6 +29,7 @@ import rida.pdc
 import logging
 import os
 
+logging.basicConfig(level=logging.DEBUG)
 log = logging.getLogger(__name__)
 
 
@@ -64,19 +65,23 @@ def wait(config, session, msg):
     # associated with which koji tag, so that when their repos are regenerated
     # in koji we can figure out which for which module build that event is
     # relevant.
+    log.debug("Assigning koji tag=%s to module build" % tag)
     build.koji_tag = tag
 
-    dependencies = rida.pdc.get_module_dependencies(pdc_session, module_info)
+
+    dependencies = rida.pdc.get_module_build_dependencies(pdc_session, module_info)
     builder = rida.builder.KojiModuleBuilder(build.name, config, tag_name=tag)
     build.buildroot_task_id = builder.buildroot_prep()
     log.debug("Adding dependencies %s into buildroot for module %s" % (dependencies, module_info))
     builder.buildroot_add_dependency(dependencies)
+    # inject dist-tag into buildroot
     srpm = builder.get_disttag_srpm(disttag="%s" % get_rpm_release_from_tag(tag))
-    task_id = builder.build(srpm)
+    task_id = builder.build(artifact_name="module-build-macros", source=srpm)
     builder.wait_task(task_id)
 
     artifact = get_artifact_from_srpm(srpm)
-    builder.buildroot_add_artifacts([artifact,])
+    builder.buildroot_add_artifacts([artifact,]) # pretty much srpm filename
     builder.buildroot_ready(artifacts=[artifact,])
+
     build.transition(config, state="build")  # Wait for the buildroot to be ready.
     session.commit()
diff --git a/submit-build.json b/submit-build.json
index 7873ee98..b31328e9 100644
--- a/submit-build.json
+++ b/submit-build.json
@@ -1,3 +1,3 @@
 {
-    "scmurl": "git://pkgs.stg.fedoraproject.org/modules/testmodule.git?#020ea37251df5019fde9e7899d2f7d7a987dfbf5"
+    "scmurl": "git://pkgs.stg.fedoraproject.org/modules/testmodule.git?#5188d22b255c9f54798926959f43967a057ca690"
 }
diff --git a/tests/test_scheduler/test_repo_done.py b/tests/test_scheduler/test_repo_done.py
index 09e8db65..8cdd4004 100644
--- a/tests/test_scheduler/test_repo_done.py
+++ b/tests/test_scheduler/test_repo_done.py
@@ -33,6 +33,7 @@ class TestRepoDone(unittest.TestCase):
         self.config.rpms_default_repository = 'dist_git_url'
         self.config.koji_profile = 'staging'  # TODO - point at a fake test config
 
+
         self.session = mock.Mock()
         self.fn = rida.scheduler.handlers.repos.done