From 6e307ec9d2cebc8fb9c4e06ca6cea52de8548710 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Aug 09 2016 08:07:31 +0000 Subject: Get the session and the requestfolder from the api --- diff --git a/pagure/api/ci/jenkins.py b/pagure/api/ci/jenkins.py index c2f5955..53b41e6 100644 --- a/pagure/api/ci/jenkins.py +++ b/pagure/api/ci/jenkins.py @@ -47,7 +47,12 @@ def jenkins_ci_notification(pagure_ci_token): flask.abort(400, "Bad Request: No build ID retrived") try: - lib_ci.process_jenkins_build(project, build_id) + lib_ci.process_jenkins_build( + SESSION, + project, + build_id, + requestfolder=APP.config['REQUESTS_FOLDER'] + ) except pagure.exceptions.PagureException as err: APP.logger.error('Error processing jenkins notification', exc_info=err) flask.abort(400, "Bad Request: %s" % err) diff --git a/pagure/lib/lib_ci.py b/pagure/lib/lib_ci.py index f9b4f92..9d2b58e 100644 --- a/pagure/lib/lib_ci.py +++ b/pagure/lib/lib_ci.py @@ -33,7 +33,7 @@ def get_project_by_ci_token(session, ci_token): return query.first() -def process_jenkins_build(project, build_id): +def process_jenkins_build(session, project, build_id, requestfolder): """ Gets the build info from jenkins and flags that particular pull-request. """ @@ -77,6 +77,6 @@ def process_jenkins_build(project, build_id): url=url, uid=None, user=repo.user.username, - requestfolder=APP.config['REQUESTS_FOLDER'], + requestfolder=requestfolder, ) SESSION.commit()