targetuserspacecreator: Refactor gathering of repositories #973

vinzenz · 2022-10-12T09:51:21Z

This patch unifies the collection of repositories.

Signed-off-by: Vinzenz Feenstra [email protected]

packit-as-a-service · 2022-10-12T09:51:26Z

Your git-forge project github.com/oamg/leapp-repository has permissions to build in @oamg/leapp Copr project configured in Packit. However, we migrated to the solution where you can configure the allowed git-forge projects in Copr yourself and will remove the configuration in Packit for the allowed projects soon. Therefore, please, add this git-forge project github.com/oamg/leapp-repository to Packit allowed forge projectsin the Copr project settings.

github-actions · 2022-10-12T09:51:35Z

Thank you for contributing to the Leapp project!

Please note that every PR needs to comply with the Leapp Guidelines and must pass all tests in order to be mergeable.
If you want to request a review or rebuild a package in copr, you can use following commands as a comment:

review please to notify leapp developers of review request
/packit copr-build to submit a public copr build using packit

To launch regression testing public members of oamg organization can leave the following comment:

/rerun to schedule basic regression tests using this pr build and leapp*master* as artifacts
/rerun 42 to schedule basic regression tests using this pr build and leapp*PR42* as artifacts
/rerun-all to schedule all tests (including sst) using this pr build and leapp*master* as artifacts
/rerun-all 42 to schedule all tests (including sst) using this pr build and leapp*PR42* as artifacts

Please open ticket in case you experience technical problem with the CI. (RH internal only)

Note: In case there are problems with tests not being triggered automatically on new PR/commit or pending for a long time, please consider rerunning the CI by commenting leapp-ci build (might require several comments). If the problem persists, contact leapp-infra.

vinzenz · 2022-10-31T16:24:04Z

/rerun

github-actions · 2022-10-31T16:30:40Z

Copr build succeeded: https://copr.fedorainfracloud.org/coprs/build/4998669

github-actions · 2022-10-31T16:54:18Z

Testing Farm request for RHEL-8.6-rhui/4998669 regression testing has been created.
Once finished, results should be available here.
Full pipeline log.

github-actions · 2022-10-31T17:26:08Z

Testing Farm request for RHEL-8.7.0-Nightly/4998669 regression testing has been created.
Once finished, results should be available here.
Full pipeline log.

github-actions · 2022-10-31T18:14:13Z

Testing Farm request for RHEL-8.6.0-Nightly/4998669 regression testing has been created.
Once finished, results should be available here.
Full pipeline log.

github-actions · 2022-10-31T18:27:52Z

Testing Farm request for RHEL-7.9-ZStream/4998669 regression testing has been created.
Once finished, results should be available here.
Full pipeline log.

github-actions · 2022-10-31T19:04:02Z

Testing Farm request for RHEL-7.9-rhui/4998669 regression testing has been created.
Once finished, results should be available here.
Full pipeline log.

github-actions · 2022-10-31T19:07:53Z

Testing Farm request for RHEL-7.9-ZStream/4998669 regression testing has been created.
Once finished, results should be available here.
Full pipeline log.

MichalHe

I've given the patch a first pass, and one more pass will likely follow. Separating the manipulation of repositories into a compact class allowing to query the needed information is a very elegant concept. As the introduced class is likely to stick, I would argue to change the names of its fields to be more descriptive. For example, the _RequestedRepoids.mapped field has a name suggesting almost nothing about its semantics.

repos/system_upgrade/common/actors/targetuserspacecreator/libraries/repoinfo.py

MichalHe · 2023-01-03T18:21:52Z

repos/system_upgrade/common/actors/targetuserspacecreator/libraries/repoinfo.py

+    def duplicated_repoids(self):
+        return {k: v for k, v in self.mapped.items() if len(v) > 1}


The property name suggests that it contains a collection of repoids that are duplicated, whereas a dictionary is returned. Every use of this property access to the values of the property requests only its keys().

Well it is right now, the point is that you can now report which repo files do contain the duplications. But this would be a follow up improvement. And it is a collection, key = repoid, value = list of repos with the same repo id)

list of repos here means the list of repository files

repos/system_upgrade/common/actors/targetuserspacecreator/libraries/repoinfo.py

repos/system_upgrade/common/models/repositoriesfacts.py

repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py

This patch unifies the collection of repositories. Signed-off-by: Vinzenz Feenstra <[email protected]>

pirat89 · 2023-01-10T15:21:07Z

repos/system_upgrade/common/libraries/repofileutils.py

@@ -26,7 +26,7 @@ def asbool(x):
    return RepositoryData(**prepared)


-def parse_repofile(repofile):
+def parse_repofile(repofile, rfile=None, kind='custom'):


extend the docstring to cover new params

pirat89 · 2023-01-11T14:31:54Z

/packit build

pirat89 · 2023-01-18T11:37:00Z

@vinzenz do you think you could finish this one during this week or want a help? :)

pirat89 · 2023-01-18T11:41:13Z

repos/system_upgrade/common/libraries/rhsm.py

@@ -169,13 +168,6 @@ def get_available_repo_ids(context):
        )

    repofiles = repofileutils.get_parsed_repofiles(context)


this call leads to the situation when all discovered repositories have the custom kind set, so repositories inside RHSMInfo msg are marked as custom. Discussed with @vinzenz , he will check whether the logic of selecting (custom, rhsm, rhui) kind could be moved into the library instead of having it in the private library of the actor.

pirat89

see the comments above. also unit-tests needs to be fixed.

vinzenz requested a review from pirat89 October 12, 2022 09:51

vinzenz force-pushed the repository-collection-refactor branch 7 times, most recently from 8f27e71 to 6e293b3 Compare October 31, 2022 14:05

vinzenz force-pushed the repository-collection-refactor branch from 6e293b3 to aeeed23 Compare October 31, 2022 22:16

vinzenz force-pushed the repository-collection-refactor branch 3 times, most recently from 96b2ac7 to f904598 Compare November 8, 2022 12:01

Rezney assigned MichalHe Dec 12, 2022

vinzenz force-pushed the repository-collection-refactor branch from f904598 to bf6e1ab Compare December 12, 2022 13:51

vinzenz changed the title ~~WIP: targetuserspacecreator: Refactor gathering of repositories~~ targetuserspacecreator: Refactor gathering of repositories Dec 12, 2022

vinzenz force-pushed the repository-collection-refactor branch 5 times, most recently from fd79fd1 to c1ae302 Compare December 13, 2022 08:30

vinzenz force-pushed the repository-collection-refactor branch from c1ae302 to 4958ac3 Compare December 13, 2022 08:36

MichalHe reviewed Jan 3, 2023

View reviewed changes

targetuserspacecreator: Refactor gathering of repositories

c18e9c6

This patch unifies the collection of repositories. Signed-off-by: Vinzenz Feenstra <[email protected]>

vinzenz force-pushed the repository-collection-refactor branch from 4958ac3 to c18e9c6 Compare January 6, 2023 07:56

pirat89 reviewed Jan 10, 2023

View reviewed changes

pirat89 mentioned this pull request Jan 10, 2023

"refactor" the targetuserspacecreator actor (and other related) #486

Open

pirat89 reviewed Jan 18, 2023

View reviewed changes

pirat89 requested changes Jan 18, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

targetuserspacecreator: Refactor gathering of repositories #973

targetuserspacecreator: Refactor gathering of repositories #973

vinzenz commented Oct 12, 2022

packit-as-a-service bot commented Oct 12, 2022

github-actions bot commented Oct 12, 2022

vinzenz commented Oct 31, 2022

github-actions bot commented Oct 31, 2022

github-actions bot commented Oct 31, 2022

github-actions bot commented Oct 31, 2022

github-actions bot commented Oct 31, 2022

github-actions bot commented Oct 31, 2022

github-actions bot commented Oct 31, 2022

github-actions bot commented Oct 31, 2022

MichalHe left a comment

MichalHe Jan 3, 2023

vinzenz Jan 6, 2023 •

edited

Loading

pirat89 Jan 9, 2023

pirat89 Jan 10, 2023

pirat89 commented Jan 11, 2023

pirat89 commented Jan 18, 2023

pirat89 Jan 18, 2023

pirat89 left a comment •

edited

Loading

		def duplicated_repoids(self):
		return {k: v for k, v in self.mapped.items() if len(v) > 1}

		@@ -169,13 +168,6 @@ def get_available_repo_ids(context):
		)

		repofiles = repofileutils.get_parsed_repofiles(context)

targetuserspacecreator: Refactor gathering of repositories #973

Are you sure you want to change the base?

targetuserspacecreator: Refactor gathering of repositories #973

Conversation

vinzenz commented Oct 12, 2022

packit-as-a-service bot commented Oct 12, 2022

github-actions bot commented Oct 12, 2022

Thank you for contributing to the Leapp project!

vinzenz commented Oct 31, 2022

github-actions bot commented Oct 31, 2022

github-actions bot commented Oct 31, 2022

github-actions bot commented Oct 31, 2022

github-actions bot commented Oct 31, 2022

github-actions bot commented Oct 31, 2022

github-actions bot commented Oct 31, 2022

github-actions bot commented Oct 31, 2022

MichalHe left a comment

Choose a reason for hiding this comment

MichalHe Jan 3, 2023

Choose a reason for hiding this comment

vinzenz Jan 6, 2023 • edited Loading

Choose a reason for hiding this comment

pirat89 Jan 9, 2023

Choose a reason for hiding this comment

pirat89 Jan 10, 2023

Choose a reason for hiding this comment

pirat89 commented Jan 11, 2023

pirat89 commented Jan 18, 2023

pirat89 Jan 18, 2023

Choose a reason for hiding this comment

pirat89 left a comment • edited Loading

Choose a reason for hiding this comment

vinzenz Jan 6, 2023 •

edited

Loading

pirat89 left a comment •

edited

Loading