Revert "Use zuul clonned repos for upstream in build_openstack_packages role" and revers zuul changes list #2818
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…es role" This is breaking builds with downstream driver in two ways: - Not using --local requires the repos to have proper remote definition. - pre-run scripts as patch_rebaser [1] also require proper remotes. For the first, we may handle it via change in dlrn [2], but for the second one I'm not sure about the best way. [1] https://github.com/release-depot/patch_rebaser/ [2] https://softwarefactory-project.io/r/c/DLRN/+/33366 This reverts commit f79ca6f.
|
[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 |
|
@raukadah @karelyatin check this, please. Feel free to propose alternatives |
|
/lgtm |
After reverting [1] we still have problems when building multiple in-flight patches in any form: 1. Having multiple depends-on on the same package does not work. 2. Piling multiple reviews and adding the depends-on to the top one is also not working. This patch is reversing the order of the related zuul changes to fix the case (2) as it will find and process the top change for the repo.
amoralej
changed the title
amoralej
added a commit
to amoralej/watcher-operator
that referenced
this pull request
Mar 21, 2025
|
Testing in openstack-k8s-operators/watcher-operator#120 |
|
/lgtm |
lewisdenny
approved these changes
Mar 25, 2025
raukadah
added a commit
to raukadah/ci-framework
that referenced
this pull request
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]. openstack-k8s-operators#2818 [2]. Signed-off-by: Chandan Kumar (raukadah) <[email protected]>
raukadah
added a commit
to raukadah/ci-framework
that referenced
this pull request
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]. openstack-k8s-operators#2818 [2]. openstack-k8s-operators@f79ca6f#diff-fedeaff036de20345e170c4f65374926975f17139c058369f2e909565054e1adR118-L134 Signed-off-by: Chandan Kumar (raukadah) <[email protected]>
raukadah
added a commit
to raukadah/ci-framework
that referenced
this pull request
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]. openstack-k8s-operators#2818 [2]. openstack-k8s-operators@f79ca6f#diff-fedeaff036de20345e170c4f65374926975f17139c058369f2e909565054e1adR118-L134 Signed-off-by: Chandan Kumar (raukadah) <[email protected]>
karelyatin
pushed a commit
that referenced
this pull request
Mar 26, 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 Signed-off-by: Chandan Kumar (raukadah) <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is breaking builds with downstream driver in two ways:
For the first, we may handle it via change in dlrn [2], but for the second one I'm not sure about the best way.
[1] https://github.com/release-depot/patch_rebaser/
[2] https://softwarefactory-project.io/r/c/DLRN/+/33366
This reverts commit f79ca6f.
After this revert we still have problems when building multiple in-flight patches in any form:
also not working.
This PR is also fixing (2) by reversing the order of the related zuul changes to find and process the top change for the repo.