NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-15 23:45:44 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[IMP] runbot: check dir exists upgrade path

Browse Source
This commit is contained in:
Xavier-Do 2023-09-28 14:54:21 +02:00 committed by xdo
parent 269e59538e
commit 06e088f82e
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
runbot/models/build.py
View File

@ -1020,10 +1020,19 @@ class BuildResult(models.Model):
for commit in (self.env.context.get('defined_commit_ids') or self.params_id.commit_ids):
if not commit.repo_id.manifest_files:
continue # skip repo without addons
source_path = self._docker_source_folder(commit)
repo_folder = self._docker_source_folder(commit)
for addons_path in (commit.repo_id.addons_paths or '').split(','):
if os.path.isdir(commit._source_path(addons_path)):
yield os.sep.join([source_path, addons_path]).strip(os.sep)
yield os.sep.join([repo_folder, addons_path]).strip(os.sep)
def _get_upgrade_path(self):
for commit in (self.env.context.get('defined_commit_ids') or self.params_id.commit_ids):
if not commit.repo_id.upgrade_paths:
continue # skip repo without addons
repo_folder = self._docker_source_folder(commit)
for upgrade_path in commit.repo_id.upgrade_paths.split(','):
if os.path.isdir(commit._source_path(upgrade_path)):
yield os.sep.join([repo_folder, upgrade_path]).strip(os.sep)
def _get_server_info(self, commit=None):
commit = commit or self._get_server_commit()

6
runbot/models/build_config.py
View File

@ -702,11 +702,7 @@ class ConfigStep(models.Model):
migrate_cmd += ['-d', migrate_db_name]
migrate_cmd += ['--stop-after-init']
migrate_cmd += ['--max-cron-threads=0']
upgrade_paths = []
for repo in target_commit_ids.mapped('repo_id'):
if repo.upgrade_paths:
for upgrade_path in repo.upgrade_paths.split(','):
upgrade_paths.append(repo.name + upgrade_path.replace(' ', ''))
upgrade_paths = list(build._get_upgrade_path())
if upgrade_paths:
migrate_cmd += ['--upgrade-path', ','.join(upgrade_paths)]