revi-archive/llvm-premerge-checks
1
0
Fork 0
Code Activity

Fix project exclusion rules

Browse source 
Previously list of projects was resolved when job run at target OS.
Now project resolution is moved to the premerge pipeline and logic
should be there.
This commit is contained in:
Mikhail Goncharov 2020-10-08 11:52:57 +02:00
parent ea943424f3
commit 1bbd71f712
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
scripts/choose_projects.py
View file

@ -49,21 +49,22 @@ class ChooseProjects:
self.dependencies = dict() # type: Dict[str,List[str]] self.dependencies = dict() # type: Dict[str,List[str]]
self.usages = dict() # type: Dict[str,List[str]] self.usages = dict() # type: Dict[str,List[str]]
self.all_projects = [] # type: List[str] self.all_projects = [] # type: List[str]
self.excluded_projects = set() # type: Set[str] self.config = {}
self.operating_system = self._detect_os() # type: str
self._load_config() self._load_config()
def _load_config(self): def _load_config(self):
logging.info('loading project config from {}'.format(self.DEPENDENCIES_FILE)) logging.info('loading project config from {}'.format(self.DEPENDENCIES_FILE))
with open(self.DEPENDENCIES_FILE) as dependencies_file: with open(self.DEPENDENCIES_FILE) as dependencies_file:
config = yaml.load(dependencies_file, Loader=yaml.SafeLoader) self.config = yaml.load(dependencies_file, Loader=yaml.SafeLoader)
self.dependencies = config['dependencies'] self.dependencies = self.config['dependencies']
for user, used_list in self.dependencies.items(): for user, used_list in self.dependencies.items():
for used in used_list: for used in used_list:
self.usages.setdefault(used, []).append(user) self.usages.setdefault(used, []).append(user)
self.all_projects = config['allprojects'] self.all_projects = self.config['allprojects']
excluded = config['excludedProjects'][self.operating_system]
self.excluded_projects = set(excluded if excluded is not None else []) def get_excluded(self, target: str) -> Set[str]:
excluded = self.config['excludedProjects'][target]
return set(excluded if excluded is not None else [])
@staticmethod @staticmethod
def _detect_os() -> str: def _detect_os() -> str:
@ -97,7 +98,7 @@ class ChooseProjects:
logging.info(f'with affected projects: {affected_projects}') logging.info(f'with affected projects: {affected_projects}')
affected_projects = self.add_dependencies(affected_projects) affected_projects = self.add_dependencies(affected_projects)
logging.info(f'with dependencies: {affected_projects}') logging.info(f'with dependencies: {affected_projects}')
to_exclude = affected_projects.intersection(self.excluded_projects) to_exclude = affected_projects.intersection(self.get_excluded(self._detect_os()))
if len(to_exclude) != 0: if len(to_exclude) != 0:
affected_projects = affected_projects - to_exclude affected_projects = affected_projects - to_exclude
logging.warning(f'{to_exclude} projects are excluded') logging.warning(f'{to_exclude} projects are excluded')

12
scripts/pipeline_premerge.py
View file

@ -59,10 +59,14 @@ if __name__ == '__main__':
if len(generic_projects) > 0: if len(generic_projects) > 0:
# Add dependencies # Add dependencies
projects = ';'.join(sorted(cp.add_dependencies(generic_projects))) projects = cp.add_dependencies(generic_projects)
logging.info(f'Projects for default checks: {projects}') logging.info(f'all projects {projects}')
steps.extend(generic_linux(projects, True)) excluded_linux = cp.get_excluded('linux')
steps.extend(generic_windows(projects)) logging.info(f'excluded for linux: {excluded_linux}')
steps.extend(generic_linux(';'.join(sorted(projects - excluded_linux)), True))
excluded_windows = cp.get_excluded('windows')
logging.info(f'excluded for windows: {excluded_windows}')
steps.extend(generic_windows(';'.join(sorted(projects - excluded_windows))))
else: else:
logging.info('No projects for default checks') logging.info('No projects for default checks')