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.py: Run product-composer iif there's a *.productcompose.in file and a 000productcompose directory. #3079

Merged
merged 1 commit into from
May 14, 2024

Conversation

gleidi-suse
Copy link
Contributor

Previously pkglistgen.py assumed that a project either used product-builder or the new product-composer, by exiting unrecoverably when a *.productcompose.in file was found but the relative 000productcompose directory was absent.

This is not the case for SL Micro as the shared SLFO codebase is still an hybrid OBS/git project and hence its stagings are not git based and can't use product composer.

This patch was tested for the SUSE:ALP:Source:Standard:1.0:Staging:A and SUSE:ALP:Products:Marble:6.0 projects (together with #3078). Instead of raising an exception when the 000productcompose directory is not found it makes a log stating that product-composer will be skipped.

…file and a 000productcompose directory.

Previously pkglistgen.py assumed that a project either used
product-builder or the new product-composer, by exiting unrecoverably
when a *.productcompose.in file was found but the relative
000productcompose directory was absent.

This is not the case for SL Micro as the shared SLFO codebase is still
an hybrid OBS/git project and hence its stagings are not git based and
can't use product composer.

This patch was tested for the SUSE:ALP:Source:Standard:1.0:Staging:A and
SUSE:ALP:Products:Marble:6.0 projects (together with
openSUSE#3078). Instead
of raising an exception when the 000productcompose directory is not
found it makes a log stating that product-composer will be skipped.
@gleidi-suse gleidi-suse changed the title pkglistgen.py: Run productcomposer iif there's a *.productcompose.in file and a 000productcompose directory. pkglistgen.py: Run product-composer iif there's a *.productcompose.in file and a 000productcompose directory. May 13, 2024
Copy link
Member

@g7 g7 left a comment

Choose a reason for hiding this comment

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

Looks good to me

Copy link
Member

@gyr gyr left a comment

Choose a reason for hiding this comment

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

LGTM

@gleidi-suse gleidi-suse merged commit ed30d28 into openSUSE:master May 14, 2024
8 of 11 checks passed
@Vogtinator
Copy link
Member

This is not the case for SL Micro as the shared SLFO codebase is still an hybrid OBS/git project and hence its stagings are not git based and can't use product composer.

Why not? 000productcompose should work without git.

@gleidi-suse
Copy link
Contributor Author

Why not? 000productcompose should work without git.

I believe the problem is with the SR stagings flow and the git backend. I was told it is still not implemented so SRs for SUSE:SLFO:Main are still done with osc and not git

@Vogtinator
Copy link
Member

Why not? 000productcompose should work without git.

I believe the problem is with the SR stagings flow and the git backend. I was told it is still not implemented so SRs for SUSE:SLFO:Main are still done with osc and not git

Do the stagings have an scmsync url set on a prj level or for 000productcompose? If not, it should work fine.

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

4 participants