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: remove auto tag if fixing match

Browse Source 
Removes auto tags from a build if the build's branches match the build
error's fixing branch.
This commit is contained in:
William Braeckman 2025-01-31 09:32:57 +01:00
parent 56912d356f
commit b474e63bf4
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
runbot/models/build_error.py
View File

@ -209,8 +209,11 @@ class BuildError(models.Model):
@api.model @api.model
def _test_tags_list(self, build_id=False): def _test_tags_list(self, build_id=False):
version = build_id.params_id.version_id.number if build_id else False version = build_id.params_id.version_id.number if build_id else False
branches = build_id.create_batch_id.bundle_id.branch_ids if build_id else self.env['runbot.branch']
def filter_tags(e): def filter_tags(e):
if e.fixing_pr_id in branches:
return False
if version: if version:
min_v = e.tags_min_version_id.number or '' min_v = e.tags_min_version_id.number or ''
max_v = e.tags_max_version_id.number or '~' max_v = e.tags_max_version_id.number or '~'

29
runbot/tests/test_build_error.py
View File

@ -500,6 +500,35 @@ class TestBuildError(RunbotCase):
self.assertEqual(sorted(['-every', '-where', '-tag_17_up_to_master', '-tag_only_17.1']), sorted(self.BuildError._disabling_tags(build_saas_171))) self.assertEqual(sorted(['-every', '-where', '-tag_17_up_to_master', '-tag_only_17.1']), sorted(self.BuildError._disabling_tags(build_saas_171)))
self.assertEqual(sorted(['-every', '-where', '-tag_17_up_to_master']), sorted(self.BuildError._disabling_tags(build_master))) self.assertEqual(sorted(['-every', '-where', '-tag_17_up_to_master']), sorted(self.BuildError._disabling_tags(build_master)))
def test_build_error_test_tags_fixing_pr(self):
fix_commit = self.env['runbot.commit'].create({
'name': 'dfdfcfcf0000ffffffffffffffffffffffffffff',
'repo_id': self.repo_server.id
})
branch_pr = self.Branch.create({
'name': '1337',
'remote_id': self.remote_server.id,
'is_pr': True,
'head': fix_commit.id,
})
commit_link_id = self.env['runbot.commit.link'].create({
'commit_id': fix_commit.id,
'match_type': 'head',
'branch_id': branch_pr.id,
})
batch = self.env['runbot.batch'].create({
'bundle_id': branch_pr.bundle_id.id,
})
build_fixing = self.create_test_build({'params_id': self.create_params({'create_batch_id': batch.id, 'commit_link_ids': commit_link_id}).id})
build_random = self.create_test_build({})
self.BuildError.create({
'content': 'foo',
'test_tags': 'bar',
'fixing_pr_id': branch_pr.id,
})
self.assertEqual([], self.BuildError._disabling_tags(build_fixing))
self.assertEqual(['-bar'], self.BuildError._disabling_tags(build_random))
def test_build_error_team_wildcards(self): def test_build_error_team_wildcards(self):
website_team = self.RunbotTeam.create({ website_team = self.RunbotTeam.create({
'name': 'website_test', 'name': 'website_test',