PR#1352: Some minor fixes - fm-orchestrator

fm-orchestrator

#1352 Some minor fixes

Merged 4 years ago by mprahl. Opened 4 years ago by cqi.

cqi/fm-orchestrator minor-fixes into master

No need of argument component_id for ComponentBuild.state_trace

Chenxiong Qi • 4 years ago

3b938db

Fix incorrect error message and method call on ComponentRpm

Chenxiong Qi • 4 years ago

f5717e3

Reuse ComponentBuild.from_component_name in tests

Chenxiong Qi • 4 years ago

26033bd

Fix arguments passed to log.debug

Chenxiong Qi • 4 years ago

5028746

module_build_service/models.py

file modified

+3 -4

		`@@ -1199,10 +1199,9 @@`
		`def from_component_nvr(cls, db_session, nvr, module_id):`
		`return db_session.query(cls).filter_by(nvr=nvr, module_id=module_id).first()`

		`- def state_trace(self, db_session, component_id):`
		`- # FIXME: remove argument component_id, just use self.id`
		`+ def state_trace(self, db_session):`
		`return (`
		`- db_session.query(ComponentBuildTrace).filter_by(component_id=component_id)`
		`+ db_session.query(ComponentBuildTrace).filter_by(component_id=self.id)`
		`.order_by(ComponentBuildTrace.state_time)`
		`.all()`
		`)`
		`@@ -1251,7 +1250,7 @@`
		`"state_name": INVERSE_BUILD_STATES[record.state],`
		`"reason": record.state_reason,`
		`}`
		`- for record in self.state_trace(db_session, self.id)`
		`+ for record in self.state_trace(db_session)`
		`],`
		`"state_url": state_url,`
		`})`

module_build_service/utils/greenwave.py

file modified

+1 -1

		`@@ -79,7 +79,7 @@`

		`log.debug(`
		`'Query to Greenwave (%s) result: status=%d, content="%s"',`
		`- (kwargs["url"], response.status_code, resp_json)`
		`+ kwargs["url"], response.status_code, resp_json`
		`)`

		`if response.status_code == 200:`

module_build_service/utils/submit.py

file modified

+4 -2

		`@@ -515,8 +515,10 @@`
		`or existing_build.ref != component_ref`
		`):`
		`raise ValidationError(`
		`- "Module build %s already exists in database, but its attributes "`
		`- " are different from resubmitted one." % component.get_module_name()`
		`+ "Component build %s of module build %s (id: %d) already "`
		`+ "exists in database, but its attributes are different from"`
		`+ " resubmitted one." % (`
		`+ component.get_name(), module.name, module.id)`
		`)`
		`continue`

tests/test_scheduler/test_tag_tagged.py

file modified

+2 -2

		`@@ -333,8 +333,8 @@`
		`module_build = module_build_service.models.ModuleBuild.get_by_id(db_session, 3)`
		`module_build.batch = 2`

		`- mbm = db_session.query(module_build_service.models.ComponentBuild).filter_by(`
		`- module_id=3, package="module-build-macros").one()`
		`+ mbm = module_build_service.models.ComponentBuild.from_component_name(`
		`+ db_session, "module-build-macros", 3)`
		`mbm.tagged = False`

		`for c in module_build.current_batch():`

tests/test_utils/test_utils.py

file modified

+65 -14

		`@@ -105,8 +105,9 @@`
		`mmd = second_module_build.mmd()`
		`mmd.get_rpm_component("tangerine").set_ref("00ea1da4192a2030f9ae023de3b3143ed647bbab")`
		`second_module_build.modulemd = mmd_to_str(mmd)`
		`- second_module_changed_component = db_session.query(models.ComponentBuild).filter_by(`
		`- package=changed_component, module_id=3).one()`
		`+`
		`+ second_module_changed_component = models.ComponentBuild.from_component_name(`
		`+ db_session, changed_component, second_module_build.id)`
		`second_module_changed_component.ref = "00ea1da4192a2030f9ae023de3b3143ed647bbab"`
		`db_session.add(second_module_changed_component)`
		`db_session.commit()`
		`@@ -173,8 +174,8 @@`
		`db_session.commit()`

		`if set_database_arch: # set architecture for build in database`
		`- second_module_changed_component = db_session.query(models.ComponentBuild).filter_by(`
		`- package="tangerine", module_id=2).one()`
		`+ second_module_changed_component = models.ComponentBuild.from_component_name(`
		`+ db_session, "tangerine", 2)`
		`mmd = second_module_changed_component.module_build.mmd()`
		`component = mmd.get_rpm_component("tangerine")`
		`component.reset_arches()`
		`@@ -810,6 +811,55 @@`
		`assert c.weight == 1.5`

		`@patch("module_build_service.scm.SCM")`
		`+ def test_record_component_builds_component_exists_already(self, mocked_scm, db_session):`
		`+ clean_database()`
		`+ mocked_scm.return_value.commit = "620ec77321b2ea7b0d67d82992dda3e1d67055b4"`
		`+ mocked_scm.return_value.get_latest.side_effect = [`
		`+ "4ceea43add2366d8b8c5a622a2fb563b625b9abf",`
		`+ "fbed359411a1baa08d4a88e0d12d426fbf8f602c",`
		`+ "dbed259411a1baa08d4a88e0d12d426fbf8f6037",`
		`+`
		`+ "4ceea43add2366d8b8c5a622a2fb563b625b9abf",`
		`+ # To simulate that when a module is resubmitted, some ref of`
		`+ # its components is changed, which will cause MBS stops`
		`+ # recording component to database and raise an error.`
		`+ "abcdefg",`
		`+ "dbed259411a1baa08d4a88e0d12d426fbf8f6037",`
		`+ ]`
		`+`
		`+ original_mmd = load_mmd(read_staged_data("testmodule"))`
		`+`
		`+ # Set the module name and stream`
		`+ mmd = original_mmd.copy("testmodule", "master")`
		`+ module_build = module_build_service.models.ModuleBuild()`
		`+ module_build.name = "testmodule"`
		`+ module_build.stream = "master"`
		`+ module_build.version = 20170109091357`
		`+ module_build.state = models.BUILD_STATES["init"]`
		`+ module_build.scmurl = \`
		`+ "https://src.stg.fedoraproject.org/modules/testmodule.git?#ff1ea79"`
		`+ module_build.batch = 1`
		`+ module_build.owner = "Tom Brady"`
		`+ module_build.time_submitted = datetime(2017, 2, 15, 16, 8, 18)`
		`+ module_build.time_modified = datetime(2017, 2, 15, 16, 19, 35)`
		`+ module_build.rebuild_strategy = "changed-and-after"`
		`+ module_build.modulemd = mmd_to_str(mmd)`
		`+ db_session.add(module_build)`
		`+ db_session.commit()`
		`+`
		`+ format_mmd(mmd, module_build.scmurl)`
		`+ module_build_service.utils.record_component_builds(db_session, mmd, module_build)`
		`+`
		`+ mmd = original_mmd.copy("testmodule", "master")`
		`+`
		`+ from module_build_service.errors import ValidationError`
		`+ with pytest.raises(`
		`+ ValidationError,`
		`+ match=r"Component build .+ of module build .+ already exists in database"):`
		`+ format_mmd(mmd, module_build.scmurl)`
		`+ module_build_service.utils.record_component_builds(db_session, mmd, module_build)`
		`+`
		`+ @patch("module_build_service.scm.SCM")`
		`def test_format_mmd_arches(self, mocked_scm):`
		`with app.app_context():`
		`clean_database()`
		`@@ -1096,12 +1146,13 @@`
		`"""`
		`module_build = models.ModuleBuild.get_by_id(db_session, 3)`
		`module_build.batch = 1`
		`- plc_component = db_session.query(models.ComponentBuild).filter_by(`
		`- module_id=3, package="perl-List-Compare").one()`
		`+ plc_component = models.ComponentBuild.from_component_name(`
		`+ db_session, "perl-List-Compare", 3)`
		`plc_component.ref = "5ceea46add2366d8b8c5a623a2fb563b625b9abd"`

		`builder = mock.MagicMock()`
		`builder.recover_orphaned_artifact.return_value = []`
		`+`
		`further_work = module_build_service.utils.start_next_batch_build(`
		`conf, module_build, db_session, builder)`

		`@@ -1184,8 +1235,8 @@`
		`module_build.rebuild_strategy = "only-changed"`
		`module_build.batch = 1`
		`# perl-List-Compare changed`
		`- plc_component = db_session.query(models.ComponentBuild).filter_by(`
		`- module_id=3, package="perl-List-Compare").one()`
		`+ plc_component = models.ComponentBuild.from_component_name(`
		`+ db_session, "perl-List-Compare", 3)`
		`plc_component.ref = "5ceea46add2366d8b8c5a623a2fb563b625b9abd"`

		`builder = mock.MagicMock()`
		`@@ -1215,8 +1266,8 @@`

		`# Complete the build`
		`plc_component.state = koji.BUILD_STATES["COMPLETE"]`
		`- pt_component = db_session.query(models.ComponentBuild).filter_by(`
		`- module_id=3, package="perl-Tangerine").one()`
		`+ pt_component = models.ComponentBuild.from_component_name(`
		`+ db_session, "perl-Tangerine", 3)`
		`pt_component.state = koji.BUILD_STATES["COMPLETE"]`

		`# Start the next build batch`
		`@@ -1242,11 +1293,11 @@`
		`"""`
		`module_build = models.ModuleBuild.get_by_id(db_session, 3)`
		`module_build.batch = 1`
		`- pt_component = db_session.query(models.ComponentBuild).filter_by(`
		`- module_id=3, package="perl-Tangerine").one()`
		`+ pt_component = models.ComponentBuild.from_component_name(`
		`+ db_session, "perl-Tangerine", 3)`
		`pt_component.ref = "6ceea46add2366d8b8c5a623b2fb563b625bfabe"`
		`- plc_component = db_session.query(models.ComponentBuild).filter_by(`
		`- module_id=3, package="perl-List-Compare").one()`
		`+ plc_component = models.ComponentBuild.from_component_name(`
		`+ db_session, "perl-List-Compare", 3)`
		`plc_component.ref = "5ceea46add2366d8b8c5a623a2fb563b625b9abd"`

		`# Components are by default built by component id. To find out that weight is respected,`