From 2824fb50945a6b3977aefc534677a854cebb7e34 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Apr 19 2018 13:57:39 +0000
Subject: [PATCH 1/2] Let's be a little more chatty about what pagure-ci is doing


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/pagure/lib/lib_ci.py b/pagure/lib/lib_ci.py
index 32b4688..3470558 100644
--- a/pagure/lib/lib_ci.py
+++ b/pagure/lib/lib_ci.py
@@ -34,11 +34,18 @@ def process_jenkins_build(session, project, build_id, requestfolder):
     """
     import jenkins
     # Jenkins Base URL
+    _log.info('Querying jenkins at: %s', project.ci_hook.ci_url)
     jenk = jenkins.Jenkins(project.ci_hook.ci_url)
     jenkins_name = project.ci_hook.ci_job
+    _log.info(
+        'Querying jenkins for project: %s, build: %s',
+        jenkins_name, build_id)
     build_info = jenk.get_build_info(jenkins_name, build_id)
+
     result = build_info.get('result')
+    _log.info('Result from jenkins: %s', result)
     url = build_info['url']
+    _log.info('URL from jenkins: %s', url)
 
     pr_id = None
     for action in build_info['actions']:
@@ -106,8 +113,9 @@ def trigger_jenkins_build(project_path, url, job, token, branch, cause):
     }
 
     server = jenkins.Jenkins(url)
-    _log.info('Pagure-CI: Triggering at: %s for: %s - data: %s' % (
-        url, job, data))
+    _log.info(
+        'Pagure-CI: Triggering at: %s for: %s - data: %s',
+        url, job, data)
     try:
         server.build_job(
             name=job,

From cdc7ecee40238c8f9b92b04871c8b790d11b5af9 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Apr 19 2018 13:57:39 +0000
Subject: [PATCH 2/2] Handle the situation when pagure is notified before the build is finished


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/pagure/lib/lib_ci.py b/pagure/lib/lib_ci.py
index 3470558..d8c256f 100644
--- a/pagure/lib/lib_ci.py
+++ b/pagure/lib/lib_ci.py
@@ -12,6 +12,7 @@
 
 # pylint: disable=too-many-locals
 import logging
+import time
 import pagure.exceptions
 import pagure.lib
 
@@ -28,7 +29,8 @@ BUILD_STATS = {
 }
 
 
-def process_jenkins_build(session, project, build_id, requestfolder):
+def process_jenkins_build(
+        session, project, build_id, requestfolder, iteration=0):
     """  Gets the build info from jenkins and flags that particular
     pull-request.
     """
@@ -42,6 +44,17 @@ def process_jenkins_build(session, project, build_id, requestfolder):
         jenkins_name, build_id)
     build_info = jenk.get_build_info(jenkins_name, build_id)
 
+    if build_info.get('building') is True:
+        _log('Build is still going, let\'s wait a sec and try again')
+        if iteration == 10:
+            raise pagure.exceptions.NoCorrespondingPR(
+                "We've been waiting for 10 seconds and the build is still "
+                "not finished.")
+        time.sleep(1)
+        return process_jenkins_build(
+            session, project, build_id, requestfolder,
+            iteration=iteration + 1)
+
     result = build_info.get('result')
     _log.info('Result from jenkins: %s', result)
     url = build_info['url']
@@ -59,7 +72,7 @@ def process_jenkins_build(session, project, build_id, requestfolder):
         raise pagure.exceptions.NoCorrespondingPR(
             'No corresponding PR found')
 
-    if result not in BUILD_STATS:
+    if not result or result not in BUILD_STATS:
         pagure.exceptions.PagureException(
             'Unknown build status: %s' % result)