yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

repo_checker: rework to handle multiple stagings per group (ie :DVD).

Browse Source
This commit is contained in:
Jimmy Berry 2017-08-23 17:05:09 -05:00
parent ffb81c445e
commit a07728fe39
1 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
repo_checker.py
View File

@ -48,7 +48,7 @@ class RepoChecker(ReviewBot.ReviewBot):
parse = project if post_comments else False parse = project if post_comments else False
results = { results = {
'cycle': CheckResult(True, None), 'cycle': CheckResult(True, None),
'install': self.install_check(project, '', directory_project, arch, [], [], parse=parse), 'install': self.install_check(project, [directory_project], arch, parse=parse),
} }
if not all(result.success for _, result in results.items()): if not all(result.success for _, result in results.items()):
@ -153,23 +153,31 @@ class RepoChecker(ReviewBot.ReviewBot):
comment = [] comment = []
for arch in self.target_archs(project): for arch in self.target_archs(project):
if arch not in self.target_archs(group): stagings = []
self.logger.debug('{}/{} not available'.format(group, arch)) directories = []
ignore = set()
for staging in self.staging_api(project).staging_walk(group):
if arch not in self.target_archs(staging):
self.logger.debug('{}/{} not available'.format(staging, arch))
continue
stagings.append(staging)
directories.append(self.mirror(staging, arch))
ignore.update(self.ignore_from_staging(project, staging, arch))
if not len(stagings):
continue continue
# Mirror both projects the first time each are encountered. # Only bother if staging can match arch, but layered first.
directory_project = self.mirror(project, arch) directories.insert(0, self.mirror(project, arch))
directory_group = self.mirror(group, arch)
ignore = self.ignore_from_staging(project, group, arch)
whitelist = self.package_whitelist(project, arch) whitelist = self.package_whitelist(project, arch)
# Perform checks on group. # Perform checks on group.
results = { results = {
'cycle': self.cycle_check(project, group, arch), 'cycle': self.cycle_check(project, stagings, arch),
'install': self.install_check(project, directory_project, directory_group, arch, ignore, whitelist), 'install': self.install_check(project, directories, arch, ignore, whitelist),
} }
if not all(result.success for _, result in results.items()): if not all(result.success for _, result in results.items()):
@ -236,7 +244,7 @@ class RepoChecker(ReviewBot.ReviewBot):
whitelist.update(self.staging_config[project].get(key, '').split(' ')) whitelist.update(self.staging_config[project].get(key, '').split(' '))
return whitelist return whitelist
def install_check(self, project, directory_project, directory_group, arch, ignore, whitelist, parse=False): def install_check(self, project, directories, arch, ignore=[], whitelist=[], parse=False):
self.logger.info('install check: start') self.logger.info('install check: start')
with tempfile.NamedTemporaryFile() as ignore_file: with tempfile.NamedTemporaryFile() as ignore_file:
@ -245,11 +253,15 @@ class RepoChecker(ReviewBot.ReviewBot):
ignore_file.write(item + '\n') ignore_file.write(item + '\n')
ignore_file.flush() ignore_file.flush()
directory_project = directories.pop(0) if len(directories) > 1 else None
# Invoke repo_checker.pl to perform an install check. # Invoke repo_checker.pl to perform an install check.
script = os.path.join(SCRIPT_PATH, 'repo_checker.pl') script = os.path.join(SCRIPT_PATH, 'repo_checker.pl')
parts = ['LC_ALL=C', 'perl', script, arch, directory_group, parts = ['LC_ALL=C', 'perl', script, arch, ','.join(directories),
'-r', directory_project, '-f', ignore_file.name, '-f', ignore_file.name, '-w', ','.join(whitelist)]
'-w', ','.join(whitelist)] if directory_project:
parts.extend(['-r', directory_project])
parts = [pipes.quote(part) for part in parts] parts = [pipes.quote(part) for part in parts]
p = subprocess.Popen(' '.join(parts), shell=True, p = subprocess.Popen(' '.join(parts), shell=True,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
@ -323,7 +335,7 @@ class RepoChecker(ReviewBot.ReviewBot):
if section: if section:
yield InstallSection(section, text) yield InstallSection(section, text)
def cycle_check(self, project, group, arch): def cycle_check(self, project, stagings, arch):
if self.skip_cycle: if self.skip_cycle:
self.logger.info('cycle check: skip due to --skip-cycle') self.logger.info('cycle check: skip due to --skip-cycle')
return CheckResult(True, None) return CheckResult(True, None)
@ -331,10 +343,13 @@ class RepoChecker(ReviewBot.ReviewBot):
self.logger.info('cycle check: start') self.logger.info('cycle check: start')
cycle_detector = CycleDetector(self.staging_api(project)) cycle_detector = CycleDetector(self.staging_api(project))
comment = [] comment = []
first = True for staging in stagings:
for index, (cycle, new_edges, new_packages) in enumerate( first = True
cycle_detector.cycles(group, arch=arch), start=1): for index, (cycle, new_edges, new_packages) in enumerate(
if new_packages: cycle_detector.cycles(staging, arch=arch), start=1):
if not new_packages:
continue
if first: if first:
comment.append('### new [cycle(s)](/project/repository_state/{}/standard)\n'.format(staging)) comment.append('### new [cycle(s)](/project/repository_state/{}/standard)\n'.format(staging))
first = False first = False