From e4a06ddac2c3cb3608a793f9004a3fb1d7997d1d Mon Sep 17 00:00:00 2001 From: Farhaan Bukhsh Date: Aug 09 2016 09:38:55 +0000 Subject: Fix lib/lib_ci --- diff --git a/pagure/lib/lib_ci.py b/pagure/lib/lib_ci.py index 9d2b58e..7cf6082 100644 --- a/pagure/lib/lib_ci.py +++ b/pagure/lib/lib_ci.py @@ -38,7 +38,8 @@ def process_jenkins_build(session, project, build_id, requestfolder): pull-request. """ import jenkins - jenk = jenkins.Jenkins(project.ci_hook[0].ci_url) + # Jenkins Base URL + jenk = jenkins.Jenkins(project.ci_hook[0].ci_url.split('/job/')[0]) jenkins_name = project.ci_hook[0].ci_url.split('/job/', 1)[1].split('/', 1)[0] build_info = jenk.get_build_info(jenkins_name, build_id) result = build_info['result'] @@ -61,7 +62,7 @@ def process_jenkins_build(session, project, build_id, requestfolder): 'Unknown build status: %s' % result) request = pagure.lib.search_pull_requests( - session, project_id=project.id, requestid=requestid) + session, project_id=project.id, requestid=pr_id) if not request: raise pagure.exceptions.PagureException('Request not found') @@ -71,7 +72,7 @@ def process_jenkins_build(session, project, build_id, requestfolder): message = pagure.lib.add_pull_request_flag( session, request=request, - username=username, + username=project.ci_hook[0].ci_type, percent=percent, comment=comment, url=url,