Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pkglistgen: ignore bootstrap_copy repo #2539

Merged
merged 1 commit into from
Apr 6, 2021
Merged

Conversation

lnussel
Copy link
Member

@lnussel lnussel commented Mar 29, 2021

Never use the bootstrap_copy repo for package solving. Staging content
might be very different so don't confuse the solver.

@coveralls
Copy link

coveralls commented Mar 29, 2021

Pull Request Test Coverage Report for Build 6412

  • 0 of 2 (0.0%) changed or added relevant lines in 1 file are covered.
  • 1 unchanged line in 1 file lost coverage.
  • Overall coverage decreased (-0.002%) to 24.161%

Changes Missing Coverage Covered Lines Changed/Added Lines %
pkglistgen/tool.py 0 2 0.0%
Files with Coverage Reduction New Missed Lines %
pkglistgen/tool.py 1 0%
Totals Coverage Status
Change from base Build 6408: -0.002%
Covered Lines: 3635
Relevant Lines: 15045

💛 - Coveralls

@coolo
Copy link
Member

coolo commented Mar 29, 2021

Add that default to osclib/conf.py instead so it's discoverable

Never use the bootstrap_copy repo for package solving. Staging content
might be very different so don't confuse the solver.
@coolo coolo merged commit 6b65b00 into openSUSE:master Apr 6, 2021
@coolo
Copy link
Member

coolo commented Apr 6, 2021

@suntorytimed
Copy link
Contributor

@@ -578,7 +578,8 @@ def update_and_solve_target(self, api, target_project, target_config, main_repo,
project, scope, force, no_checkout,
only_release_packages, stop_after_solve):
self.all_architectures = target_config.get('pkglistgen-archs').split(' ')
self.repos = self.expand_repos(project, main_repo)
ignore_repos = set(target_config.get('pkglistgen-ignore_repos').split(' '))
self.repos = [ r for r in self.expand_repos(project, main_repo) if r[0] != project or r[1] not in ignore_repos ]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it intentional that the ignore_repos list doesn't influence recursive expansion?

If you have e.g. projectA/standard -> projectB/bootstrap_copy -> projectC/standard, then it would solve against projectA/standard -> projectC/standard

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

project C doesn't contain any packages in the factory case so doesn't matter.

@Vogtinator
Copy link
Member

https://botmaster.suse.de/go/tab/build/detail/Pkglistgen.openSUSE_Factory/11219/pkglistgen/1/openSUSE_Factory_ARM - your default is not working

This PR actually defines defaults for openSUSE:Factory, openSUSE:Leap and openSUSE:Jump only. For others, it works for pkglistgen-archs because that's explicitly defined in the OSRT:Config attribute there.

So either this needs to define defaults for the other projects as well or it's necessary to configure it explicitly everywhere. I'm in favor of the former, because most projects don't need this setting.

@lnussel
Copy link
Member Author

lnussel commented Apr 6, 2021

obviously the method is discoverable

@sysrich
Copy link
Member

sysrich commented Apr 8, 2021

This also seems to have broken all ring1 stagings in Factory, which can no longer find libc.so.6 and anything else from bootstrap_copy

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants