PR#235: koji_block_retired: do not raise errors, only log - fedora-infra/toddlers

Lenka Segura • 2 years ago

1bd500e

Lenka Segura • 2 years ago

12132af

tests/plugins/test_koji_block_retired.py

file modified

+2 -4

		`@@ -163,8 +163,7 @@`
		`self.toddler_cls.koji_session.packageListBlock.side_effect = koji.GenericError(`
		`"Failed"`
		`)`
		`- with pytest.raises(koji.GenericError):`
		`- self.toddler_cls.process_block_retired(config, message)`
		`+ self.toddler_cls.process_block_retired(config, message)`
		`assert (`
		`caplog.records[-1].message`
		`== "Failed to block retired package example-repo on branch f38: Failed"`
		`@@ -188,8 +187,7 @@`
		`self.toddler_cls.koji_session.packageListBlock.side_effect = koji.GenericError(`
		`"Failed"`
		`)`
		`- with pytest.raises(koji.GenericError):`
		`- self.toddler_cls.process_block_retired(config, message)`
		`+ self.toddler_cls.process_block_retired(config, message)`
		`assert (`
		`caplog.records[-1].message`
		`== "Failed to block retired package example-epel-repo on branch f38: Failed"`

toddlers/plugins/koji_block_retired.py

file modified

+3 -3

		`@@ -108,7 +108,6 @@`
		`self.koji_session.untagBuild(tag=branch_name, build=repo)`
		`except koji.GenericError as e:`
		`_log.exception(f"Failed to untag build in koji: {e}")`
		`- raise`

		`try:`
		`_log.info(f"Blocking package {repo}, tag: {branch_name}")`
		`@@ -117,7 +116,9 @@`
		`_log.exception(`
		`f"Failed to block retired package {repo} on branch {branch_name}: {e}"`
		`)`
		`- raise`
		`+`
		`+ # TODO: In case of exception while blocking a package in koji,`
		`+ # send email with the list of packages that failed to block`

		`# If a package moves from EPEL to RHEL it can only be built if it is unblocked`
		`# in the epel build tag. Therefore unblock all retired EPEL packages in the`
		`@@ -134,7 +135,6 @@`
		`)`
		`except koji.GenericError as e:`
		`_log.exception(f"Failed unblocking epel build tag: {e}")`
		`- raise`


		`def get_arguments(args):`