NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-27 13:25:47 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[IMP] runbot: add read_source on commit

Browse Source
This commit is contained in:
Xavier-Do 2019-07-12 16:31:17 +02:00
parent 21c3686543
commit c31c9642be
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
runbot/common.py
View File

@ -28,9 +28,18 @@ class Commit():
def export(self): def export(self):
return self.repo._git_export(self.sha) return self.repo._git_export(self.sha)
def read_source(self, file, mode='r'):
file_path = self._source_path(file)
try:
with open(file_path, mode) as f:
return f.read()
except:
return False
def __str__(self): def __str__(self):
return '%s:%s' % (self.repo.short_name, self.sha) return '%s:%s' % (self.repo.short_name, self.sha)
def fqdn(): def fqdn():
return socket.getfqdn() return socket.getfqdn()

3
runbot/models/build_config.py
View File

@ -337,8 +337,7 @@ class ConfigStep(models.Model):
docker_source_folder = build._docker_source_folder(commit) docker_source_folder = build._docker_source_folder(commit)
for manifest_file in commit.repo.manifest_files.split(','): for manifest_file in commit.repo.manifest_files.split(','):
pattern_to_omit.add('*%s' % manifest_file) pattern_to_omit.add('*%s' % manifest_file)
for (addons_path, module, manifest_file_name) in build._get_available_modules(commit): for (addons_path, module, _) in build._get_available_modules(commit):
module = os.path.basename(module_path)
if module not in modules_to_install: if module not in modules_to_install:
# we want to omit docker_source_folder/[addons/path/]module/* # we want to omit docker_source_folder/[addons/path/]module/*
module_path_in_docker = os.path.join(docker_source_folder, addons_path, module) module_path_in_docker = os.path.join(docker_source_folder, addons_path, module)