x/ciwatch
Code Issues Proposed changes

Support Jenkins to Zuul rename

Browse Source 
Jenkins went away, and Zuul soon would stop pretending to be Jenkins
[1]. Support new user name along with the old one.

[1] http://lists.openstack.org/pipermail/openstack-dev/2016-June/097595.html

Change-Id: I81ce306af044c3a2e76ff8a7685bcfe964292f0b
This commit is contained in:
Mikhail S Medvedev 2016-06-17 15:18:07 -05:00
parent 4bf341cc15
commit 8fbb338d6e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ciwatch/events.py
View File

@ -27,7 +27,7 @@ pipeline_pattern = re.compile("\((.*)\spipeline\)")
possible_results = "FAILURE|SUCCESS|NOT_REGISTERED|UNSTABLE"
comment_pattern = re.compile("[-*]\s+([^\s*]+)\s+(http[^\s*]+) : (%s)" %
possible_results)
trusted_author_names = ["Jenkins check"]
trusted_author_names = ["Jenkins check", "Zuul check"]
def _process_project_name(project_name):
@ -60,7 +60,7 @@ def _process_event(event):
def _is_ci_user(name):
ci_keywords = ['CI', 'Jenkins', 'Bot']
ci_keywords = ['CI', 'Jenkins', 'Bot', 'Zuul']
return any(word in name for word in ci_keywords)

2
ciwatch/models.py
View File

@ -77,7 +77,7 @@ class CiServer(Base):
id = Column(Integer, primary_key=True)
name = Column(String(128))
# Official OpenStack CIs are trusted (e.g., Jenkins)
# Official OpenStack CIs are trusted
trusted = Column(Boolean, default=False)
ci_owner_id = Column(Integer, ForeignKey('ci_owners.id'))

4
ciwatch/templates/project.html.jinja
View File

@ -38,8 +38,8 @@
</ul>
</div>
<button id="verified-1-button" class="btn btn-default" type="button" data-toggle="button">Highlight Jenkins -1 votes</button>
<button id="verified1-button" class="btn btn-default" type="button" data-toggle="button">Highlight Jenkins +1 votes</button>
<button id="verified-1-button" class="btn btn-default" type="button" data-toggle="button">Highlight Trusted -1 votes</button>
<button id="verified1-button" class="btn btn-default" type="button" data-toggle="button">Highlight Trusted +1 votes</button>
<button id="select-button" class="btn btn-default" type="button" data-toggle="button">Select</button>
</div>