From 30847761985c6e95a46543541d9d6970fa99a838 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Aug 08 2016 17:30:38 +0000 Subject: Drop all the pagure_c specific code, we want to be generic in this code --- diff --git a/pagure/templates/plugin.html b/pagure/templates/plugin.html index ab48797..3cbeb75 100644 --- a/pagure/templates/plugin.html +++ b/pagure/templates/plugin.html @@ -17,16 +17,6 @@ ) }}" method="post"> {{ plugin.description | markdown | noJS | safe }} - {% if pagure_ci_token and (plugin.name == 'Pagure CI') %} -
- - -
- {% endif %} - {% for field in fields %} {{ render_field_in_row(field) }} diff --git a/pagure/ui/plugins.py b/pagure/ui/plugins.py index d7b0e56..d0eda4d 100644 --- a/pagure/ui/plugins.py +++ b/pagure/ui/plugins.py @@ -20,14 +20,8 @@ import pagure.forms from pagure import APP, SESSION, login_required, is_repo_admin from pagure.lib.model import BASE from pagure.exceptions import FileNotFoundException -from pagure.hooks import jenkins_hook from pagure.lib import model -try: - from pagure.lib import pagure_ci -except ImportError: - pagure_ci = None - import json from kitchen.text.converters import to_bytes from cryptography.hazmat.primitives import constant_time @@ -43,9 +37,6 @@ def get_plugin_names(blacklist=None): elif not isinstance(blacklist, list): blacklist = [blacklist] - if pagure_ci is None and 'Pagure CI' not in blacklist: - blacklist.append('Pagure CI') - output = [ plugin.name for plugin in plugins @@ -101,7 +92,6 @@ def view_plugin(repo, plugin, username=None, full=True): fields = [] new = True dbobj = plugin.db_object() - pagure_ci_token = None if hasattr(repo, plugin.backref): dbobj = getattr(repo, plugin.backref) @@ -110,9 +100,6 @@ def view_plugin(repo, plugin, username=None, full=True): if dbobj and len(dbobj) > 0: dbobj = dbobj[0] new = False - # To populate the pagure CI token if generated - if hasattr(dbobj, "pagure_ci_token") and plugin.backref == "hook_pagure_ci": - pagure_ci_token = dbobj.pagure_ci_token else: dbobj = plugin.db_object() @@ -144,7 +131,6 @@ def view_plugin(repo, plugin, username=None, full=True): username=username, plugin=plugin, form=form, - pagure_ci_token=pagure_ci_token, fields=fields) if form.active.data: @@ -178,29 +164,4 @@ def view_plugin(repo, plugin, username=None, full=True): username=username, plugin=plugin, form=form, - pagure_ci_token=pagure_ci_token, fields=fields) - -if pagure_ci is not None: - @APP.route('/hooks//build-finished', methods=['POST']) - def hook_finished(pagure_ci_token): - """ Flags the Pull-request after getting notification from Jenkins - """ - - try: - data = json.loads(flask.request.get_data()) - cfg = jenkins_hook.get_configs( - data['name'], jenkins_hook.Service.JENKINS)[0] - build_id = data['build']['number'] - - if not constant_time.bytes_eq( - to_bytes(pagure_ci_token), to_bytes(cfg.pagure_ci_token)): - return ('Token mismatch', 401) - - except (TypeError, ValueError, KeyError, jenkins_hook.ConfigNotFound) as exc: - APP.logger.error('Error processing jenkins notification', exc_info=exc) - flask.abort(400, "Bad Request") - - APP.logger.info('Received jenkins notification') - pagure_ci.process_build(APP.logger, cfg, build_id) - return ('', 204)