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

Use zuul clonned repos for upstream in build_openstack_packages role #2822

Merged
merged 1 commit into from
Mar 26, 2025

Conversation

raukadah
Copy link
Contributor

@raukadah raukadah commented Mar 25, 2025

In build_openstack_packages role for building rpms from gerrit and github, we are clonning the repo and checking out specific change.

With these tasks, we are not able to build dlrn rpms if we have multiple prs/crs from same project.

But we want to build rpms from all changes.
In order to fix, Zuul knows how to checkout proper repos with changes under test and from Depends-on.

DLRN always looks for clonned repos in DLRN data directory. In order to use zuul clonned sources with DLRN, We are creating symlink to dlrn data project directory and let's dlrn do the job for upstream repos only.

Note: we reverted the similar pr[1] here as original change was lacking proper condition[2] leading to breaking downstream build openstack packages role.

By adding proper conditional for upstream, it fixes the issue.

Links:
[1]. #2818
[2]. f79ca6f#diff-fedeaff036de20345e170c4f65374926975f17139c058369f2e909565054e1adR118-L134

@raukadah raukadah requested a review from a team as a code owner March 25, 2025 09:42
Copy link
Contributor

openshift-ci bot commented Mar 25, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

In build_openstack_packages role for building rpms from gerrit and
github, we are clonning the repo and checking out specific change.

With these tasks, we are not able to build dlrn rpms if we have multiple
prs/crs from same project.

But we want to build rpms from all changes.
In order to fix, Zuul knows how to checkout proper repos
with changes under test and from Depends-on.

DLRN always looks for clonned repos in DLRN data directory.
In order to use zuul clonned sources with DLRN, We are creating
symlink to dlrn data project directory and let's dlrn do the job for
upstream repos only.

Note: we reverted the similar pr[1] here as original change was lacking
proper condition[2] leading to breaking downstream build openstack
packages role.

By adding proper conditional for upstream, it fixes the issue.

Links:
[1]. openstack-k8s-operators#2818
[2]. openstack-k8s-operators@f79ca6f#diff-fedeaff036de20345e170c4f65374926975f17139c058369f2e909565054e1adR118-L134

Signed-off-by: Chandan Kumar (raukadah) <[email protected]>
Copy link
Collaborator

@frenzyfriday frenzyfriday left a comment

Choose a reason for hiding this comment

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

@raukadah could you pls point me to where you wanted to add the condition (the link for [2] is missing)? I can take a look at that, get that merged and approve this one

@raukadah
Copy link
Contributor Author

@raukadah could you pls point me to where you wanted to add the condition (the link for [2] is missing)? I can take a look at that, get that merged and approve this one

Thank you @frenzyfriday for looking into it. We need to add the conditional here: f79ca6f#diff-fedeaff036de20345e170c4f65374926975f17139c058369f2e909565054e1adR118-L134

@karelyatin karelyatin enabled auto-merge (rebase) March 26, 2025 08:19
@karelyatin
Copy link
Contributor

/lgtm

@amoralej
Copy link
Contributor

Symlinking upstream is fine as it's using --local and not using patch_rebaser 👍

For downstream, we don't symlink and let dlrn to clone the upstream repo, as it's intended to be used to test patches branch not upstream repo.

/lgtm

@karelyatin karelyatin merged commit 3c44d02 into openstack-k8s-operators:main Mar 26, 2025
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants