To try to approach a more intuitive behavior for jobs which apply to tags but are defined in-repo (or even for centrally defined jobs which should behave differently on tags from different branches), look up which branches contain the commit referenced by a tag and use that list in branch matchers. If a tag item is enqueued, we look up the branches which contain the commit referenced by the tag. If any of those branches match a branch matcher, the matcher is considered to have matched. This means that if a release job is defined on multiple branches, the branch variant from each branch the tagged commit is on will be used. A typical case is for a tagged commit to appear in exactly one branch. In that case, the most intuitive behavior (the version of the job defined on that branch) occurs. A less typical but perfectly reasonable case is that there are two identical branches (ie, stable has just branched from master but not diverged). In this case, if an identical commit is merged to both branches, then both variants of a release job will run. However, it's likely that these variants are identical anyway, so the result is apparently the same as the previous case. However if the variants are defined centrally, then they may differ while the branch contents are the same, causing unexpected behavior when both variants are applied. If two branches have diverged, it will not be possible for the same commit to be added to both branches, so in that case, only one of the variants will apply. However, tags can be created retroactively, so that even if a branch has diverged, if a commit in the history of both branches is tagged, then both variants will apply, possibly producing unexpected behavior. Considering that the current behavior is to apply all variants of jobs on tags all the time, the partial reduction of scope in the most typical circumstances is probably a useful change. Change-Id: I5734ed8aeab90c1754e27dc792d39690f16ac70c Co-Authored-By: Tobias Henkel <tobias.henkel@bmw.de>
174 lines
4.7 KiB
Python
174 lines
4.7 KiB
Python
# Copyright 2015 Red Hat, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
"""
|
|
This module defines classes used in matching changes based on job
|
|
configuration.
|
|
"""
|
|
|
|
import re
|
|
|
|
|
|
class AbstractChangeMatcher(object):
|
|
|
|
def __init__(self, regex):
|
|
self._regex = regex
|
|
self.regex = re.compile(regex)
|
|
|
|
def matches(self, change):
|
|
"""Return a boolean indication of whether change matches
|
|
implementation-specific criteria.
|
|
"""
|
|
raise NotImplementedError()
|
|
|
|
def copy(self):
|
|
return self.__class__(self._regex)
|
|
|
|
def __deepcopy__(self, memo):
|
|
return self.copy()
|
|
|
|
def __eq__(self, other):
|
|
return str(self) == str(other)
|
|
|
|
def __ne__(self, other):
|
|
return not self.__eq__(other)
|
|
|
|
def __str__(self):
|
|
return '{%s:%s}' % (self.__class__.__name__, self._regex)
|
|
|
|
def __repr__(self):
|
|
return '<%s %s>' % (self.__class__.__name__, self._regex)
|
|
|
|
|
|
class ProjectMatcher(AbstractChangeMatcher):
|
|
|
|
def matches(self, change):
|
|
return self.regex.match(str(change.project))
|
|
|
|
|
|
class BranchMatcher(AbstractChangeMatcher):
|
|
fullmatch = False
|
|
|
|
def matches(self, change):
|
|
if hasattr(change, 'branch'):
|
|
# an implied branch matcher must do a fullmatch to work correctly
|
|
if self.fullmatch:
|
|
if self.regex.fullmatch(change.branch):
|
|
return True
|
|
else:
|
|
if self.regex.match(change.branch):
|
|
return True
|
|
return False
|
|
if self.regex.match(change.ref):
|
|
return True
|
|
if hasattr(change, 'containing_branches'):
|
|
for branch in change.containing_branches:
|
|
if self.regex.fullmatch(branch):
|
|
return True
|
|
return False
|
|
|
|
|
|
class ImpliedBranchMatcher(BranchMatcher):
|
|
fullmatch = True
|
|
|
|
|
|
class FileMatcher(AbstractChangeMatcher):
|
|
|
|
pass
|
|
|
|
|
|
class AbstractMatcherCollection(AbstractChangeMatcher):
|
|
|
|
def __init__(self, matchers):
|
|
self.matchers = matchers
|
|
|
|
def __eq__(self, other):
|
|
return str(self) == str(other)
|
|
|
|
def __str__(self):
|
|
return '{%s:%s}' % (self.__class__.__name__,
|
|
','.join([str(x) for x in self.matchers]))
|
|
|
|
def __repr__(self):
|
|
return '<%s>' % self.__class__.__name__
|
|
|
|
def copy(self):
|
|
return self.__class__(self.matchers[:])
|
|
|
|
|
|
class AbstractMatchFiles(AbstractMatcherCollection):
|
|
|
|
commit_regex = re.compile('^/COMMIT_MSG$')
|
|
|
|
@property
|
|
def regexes(self):
|
|
for matcher in self.matchers:
|
|
yield matcher.regex
|
|
|
|
|
|
class MatchAllFiles(AbstractMatchFiles):
|
|
|
|
def matches(self, change):
|
|
# NOTE(yoctozepto): make irrelevant files matcher match when
|
|
# there are no files to check - return False (NB: reversed)
|
|
if not (hasattr(change, 'files') and change.files):
|
|
return False
|
|
if len(change.files) == 1 and self.commit_regex.match(change.files[0]):
|
|
return False
|
|
for file_ in change.files:
|
|
matched_file = False
|
|
for regex in self.regexes:
|
|
if regex.match(file_):
|
|
matched_file = True
|
|
break
|
|
if self.commit_regex.match(file_):
|
|
matched_file = True
|
|
if not matched_file:
|
|
return False
|
|
return True
|
|
|
|
|
|
class MatchAnyFiles(AbstractMatchFiles):
|
|
|
|
def matches(self, change):
|
|
# NOTE(yoctozepto): make files matcher match when
|
|
# there are no files to check - return True
|
|
if not (hasattr(change, 'files') and change.files):
|
|
return True
|
|
if len(change.files) == 1 and self.commit_regex.match(change.files[0]):
|
|
return True
|
|
for file_ in change.files:
|
|
for regex in self.regexes:
|
|
if regex.match(file_):
|
|
return True
|
|
return False
|
|
|
|
|
|
class MatchAll(AbstractMatcherCollection):
|
|
|
|
def matches(self, change):
|
|
for matcher in self.matchers:
|
|
if not matcher.matches(change):
|
|
return False
|
|
return True
|
|
|
|
|
|
class MatchAny(AbstractMatcherCollection):
|
|
|
|
def matches(self, change):
|
|
for matcher in self.matchers:
|
|
if matcher.matches(change):
|
|
return True
|
|
return False
|