Lubuntu/lugito
8
0
Fork 0
mirror of https://github.com/lubuntu-team/lugito.git synced 2025-05-01 21:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup and parallelize the Jenkins code.

Browse Source
This commit is contained in:
Simon Quigley 2020-05-26 14:46:35 -05:00
parent 935867aa7e
commit d075f45568
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lugito/connectors/jenkins.py
View File

@ -48,6 +48,8 @@ class jenkins(object):
self.logger = logging.getLogger('lugito.connector.jenkins') self.logger = logging.getLogger('lugito.connector.jenkins')
self.jenkins = self.auth_jenkins()
# Add log level # Add log level
ch = logging.StreamHandler() ch = logging.StreamHandler()
@ -110,18 +112,11 @@ class jenkins(object):
status = None status = None
# Authenticate with the server print("Getting project")
jenkins = self.auth_jenkins()
# Check if the project name matches a valid one on the server # If the server has the job, use it
# If it does, grab the job info, if it doesn't, stop if self.jenkins.has_job(proj_name):
proj = None proj = (proj_name, self.jenkins.get_job(proj_name))
for job in jenkins.get_jobs():
if job[0] == proj_name:
proj = job
if not proj:
return status
# Get the status of the last completed build if there isone # Get the status of the last completed build if there isone
try: try:
@ -137,7 +132,9 @@ class jenkins(object):
# If it has been consistently stable, don't cause extra noise # If it has been consistently stable, don't cause extra noise
if status == "SUCCESS" and last_status == status: if status == "SUCCESS" and last_status == status:
return None return proj[0], None, url
print("Customizing build status")
# Customize the message depending on the previous build status # Customize the message depending on the previous build status
if status == "SUCCESS": if status == "SUCCESS":

20
lugito/webhooks.py
View File

@ -189,15 +189,25 @@ def jenkinstrigger():
return 'Ok' return 'Ok'
def processjenkinsircnotify(request):
"""Process the request given so it can be daemonized"""
# Get the status of the most recent build to the given project
proj, status, link = jenkins_con.receive(request)
if status:
irc_con.send("Lubuntu CI", proj, status, link)
@app.route("/jenkinsnag", methods=["POST"]) @app.route("/jenkinsnag", methods=["POST"])
def jenkinsircnotify(): def jenkinsircnotify():
"""Jenkins IRC notifications""" """Jenkins IRC notifications"""
# Get the status of the most recent build to the given project print("Processing request")
proj, status, link = jenkins_con.receive(request.data) send_notification = threading.Thread(
target=processjenkinsircnotify, args=[request.data])
if status: send_notification.setDaemon(True)
irc_con.send("Lubuntu CI", proj, status, link) send_notification.start()
return 'Ok' return 'Ok'