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: improve min version management

Browse Source
This commit is contained in:
Xavier-Do 2024-12-24 14:30:40 +01:00
parent c2487f141e
commit 9377df5dd0
4 changed files with 73 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runbot/__manifest__.py
View File

@ -6,7 +6,7 @@
'author': "Odoo SA",
'website': "http://runbot.odoo.com",
'category': 'Website',
'version': '5.8',
'version': '5.9',
'application': True,
'depends': ['base', 'base_automation', 'website'],
'data': [

21
runbot/migrations/18.0.5.9/post-migration.py Normal file
View File

@ -0,0 +1,21 @@
def migrate(cr, version):
cr.execute("""
WITH helper AS
(
SELECT v.id,
(
SELECT v2.id
FROM runbot_version v2
WHERE Coalesce(v2.SEQUENCE, 9999) <= Coalesce(v.SEQUENCE, 9999)
AND v2.number < v.number
ORDER BY v2.SEQUENCE DESC,
v2.number DESC limit 1 ) AS v_excluded
FROM runbot_version v
ORDER BY v.SEQUENCE DESC,
v.NUMBER DESC )
UPDATE runbot_build_error
SET tags_min_version_excluded_id = h.v_excluded
FROM helper h
WHERE h.id = tags_min_version_id;
""")
cr.execute("""ALTER TABLE runbot_build_error DROP COLUMN tags_min_version_id;""")

24
runbot/models/build_error.py
View File

@ -100,7 +100,8 @@ class BuildError(models.Model):
fixing_pr_url = fields.Char('Fixing PR url', related='fixing_pr_id.branch_url')
test_tags = fields.Char(string='Test tags', help="Comma separated list of test_tags to use to reproduce/remove this error", tracking=True)
tags_min_version_id = fields.Many2one('runbot.version', 'Tags Min version', help="Minimal version where the test tags will be applied.", tracking=True)
tags_min_version_excluded_id = fields.Many2one('runbot.version', 'Tag min version (excluded)')
tags_min_version_id = fields.Many2one('runbot.version', 'Tags Min version', compute="_compute_tags_min_version_id", inverse="_inverse_tags_min_version_id", help="Minimal version where the test tags will be applied.", tracking=True)
tags_max_version_id = fields.Many2one('runbot.version', 'Tags Max version', help="Maximal version where the test tags will be applied.", tracking=True)
common_qualifiers = JsonDictField('Common Qualifiers', compute='_compute_common_qualifiers', store=True, help="Minimal qualifiers in common needed to link error content.")
@ -121,6 +122,27 @@ class BuildError(models.Model):
random = fields.Boolean('Random', compute="_compute_random", store=True)
@api.constrains('tags_min_version_id', 'tags_max_version_id')
def _check_min_max_version(self):
for build_error in self:
if build_error.tags_min_version_id and build_error.tags_max_version_id and build_error.tags_min_version_id.number >= build_error.tags_max_version_id.number:
raise ValidationError('Tags Min version should be lower than Tags Max version')
def _inverse_tags_min_version_id(self):
all_versions = self.env['runbot.version'].search([]).sorted(lambda rec: (rec.sequence, rec.number), reverse=True)
for records in self:
records.tags_min_version_excluded_id = False
if records.tags_min_version_id:
records.tags_min_version_excluded_id = next((version for version in all_versions if version.number < records.tags_min_version_id.number), False)
@api.depends('tags_min_version_id')
def _compute_tags_min_version_id(self):
all_versions = self.env['runbot.version'].search([]).sorted(lambda rec: (rec.sequence, rec.number))
for records in self:
records.tags_min_version_id = False
if records.tags_min_version_excluded_id:
records.tags_min_version_id = next((version for version in all_versions if version.number > records.tags_min_version_excluded_id.number), False)
@api.depends('build_error_link_ids')
def _compute_unique_build_error_link_ids(self):
for record in self:

32
runbot/tests/test_build_error.py
View File

@ -456,16 +456,16 @@ class TestBuildError(RunbotCase):
self.assertNotIn('-blah', self.BuildError._disabling_tags())
def test_build_error_test_tags_min_max_version(self):
version_17 = self.Version.create({'name': '17.0'})
version_saas_171 = self.Version.create({'name': 'saas-17.1'})
version_master = self.Version.create({'name': 'master'})
version_17 = self.env['runbot.version']._get('17.0')
version_saas_171 = self.env['runbot.version']._get('saas-17.1')
version_master = self.env['runbot.version']._get('master')
build_v13 = self.create_test_build({'local_result': 'ko'})
build_v17 = self.create_test_build({'local_result': 'ko', 'params_id': self.create_params({'version_id': version_17.id}).id})
build_saas_171 = self.create_test_build({'local_result': 'ko', 'params_id': self.create_params({'version_id': version_saas_171.id}).id})
build_master = self.create_test_build({'local_result': 'ko', 'params_id': self.create_params({'version_id': version_master.id}).id})
self.BuildError.create(
errors = self.BuildError.create(
[
{
"content": "foobar",
@ -494,11 +494,35 @@ class TestBuildError(RunbotCase):
]
)
self.assertEqual(errors[1].tags_min_version_id, version_17)
self.assertEqual(errors[3].tags_min_version_id, version_saas_171)
self.assertEqual(errors[3].tags_min_version_excluded_id, version_17, f'{errors[3].tags_min_version_excluded_id.name} does not match version_17')
self.assertEqual(sorted(['-every', '-where', '-tag_17_up_to_master', '-tag_up_to_17', '-tag_only_17.1']), sorted(self.BuildError._disabling_tags()), "Should return the whole list without parameters")
self.assertEqual(sorted(['-every', '-where', '-tag_up_to_17']), sorted(self.BuildError._disabling_tags(build_v13)))
self.assertEqual(sorted(['-every', '-where', '-tag_up_to_17', '-tag_17_up_to_master']), sorted(self.BuildError._disabling_tags(build_v17)))
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)))
error_master = self.BuildError.create([{
"content": "blah",
"build_ids": [(6, 0, [build_v17.id])],
"test_tags": "tag_master_only",
"tags_max_version_id": version_master.id,
"tags_min_version_id": version_master.id,
}])
self.assertEqual(error_master.tags_min_version_id, version_master)
self.assertEqual(error_master.tags_max_version_id, version_master)
self.assertEqual(error_master.tags_min_version_excluded_id, version_saas_171)
version_99 = self.env['runbot.version']._get('99.0')
self.env.flush_all()
self.env.cache.invalidate()
build_v99 = self.create_test_build({'local_result': 'ko', 'params_id': self.create_params({'version_id': version_99.id}).id})
self.assertEqual(error_master.tags_min_version_excluded_id, version_saas_171, "excluded id shouldn't have changed")
self.assertEqual(error_master.tags_min_version_id, version_99)
self.assertEqual(sorted(['-every', '-where', '-tag_17_up_to_master', '-tag_master_only']), sorted(self.BuildError._disabling_tags(build_v99)))
def test_build_error_test_tags_fixing_pr(self):
fix_commit = self.env['runbot.commit'].create({