| -@gerrit:opendev.org- Lukas Kranz proposed: [zuul/zuul-jobs] 888021: Fix blockdiag issue https://review.opendev.org/c/zuul/zuul-jobs/+/888021 | 06:28 | |
| -@gerrit:opendev.org- Lukas Kranz proposed: [zuul/zuul-jobs] 887917: prepare-workspace-git: Add ability to define synced pojects https://review.opendev.org/c/zuul/zuul-jobs/+/887917 | 06:48 | |
| -@gerrit:opendev.org- Lukas Kranz proposed: [zuul/zuul-jobs] 888021: Fix blockdiag issue https://review.opendev.org/c/zuul/zuul-jobs/+/888021 | 07:05 | |
| -@gerrit:opendev.org- Lukas Kranz proposed: [zuul/zuul-jobs] 888021: Fix blockdiag issue https://review.opendev.org/c/zuul/zuul-jobs/+/888021 | 07:06 | |
| -@gerrit:opendev.org- Simon Westphahl proposed: [zuul/nodepool] 887356: dnm: Increase OpenStack driver cache TTL https://review.opendev.org/c/zuul/nodepool/+/887356 | 08:19 | |
| -@gerrit:opendev.org- Flavio Percoco Premoli proposed: [zuul/zuul] 885455: Use built-in URL data type instead of custom parse https://review.opendev.org/c/zuul/zuul/+/885455 | 09:15 | |
| @newbie23:matrix.org | Hello guys. We are using Zuul + GitHub. Does Zuul support chained/stacked pull requests in some way? | 09:47 |
|---|---|---|
| @clarkb:matrix.org | > <@newbie23:matrix.org> Hello guys. We are using Zuul + GitHub. Does Zuul support chained/stacked pull requests in some way? | 10:40 |
| > | ||
| Yes via depends-on declarations in the pull request message | ||
| @flaper87:matrix.org | > <@jim:acmegating.com> flaper87: fungi regarding the docs job, i already made https://review.opendev.org/887865 yesterday | 10:57 |
| Thanks a bunch, I completely missed your PR (Despite my quick search for it) | ||
| @flaper87:matrix.org | corvus: alright, here's the [preview](https://storage.bhs.cloud.ovh.net/tenants) for [this review](https://review.opendev.org/c/zuul/zuul/+/885455) | 11:02 |
| Almost there 💪 | ||
| @newbie23:matrix.org | If I only have Zuul pick protected branches, then every single PR must have the protected branch as the target branch (e.g. "main"). That makes code reviews difficult as chained PRs also contain commits from the previous PRs. | 11:53 |
| I was thinking to change Zuul config to pick also unrprotected branches (exclude-unprotected-branches to false) and then have all chained PR to use the previous PR branch as target branch. | ||
| That might work, but we also have a squash&merge policy. | ||
| This means that we would need to merge PRs from last PR for first PR, once everything is tested :) | ||
| Is it possible? | ||
| Any other suggestions/ best practice in case of using stacked/chained PRs with Zuul? | ||
| Thanks for your time and help!! | ||
| -@gerrit:opendev.org- Zuul merged on behalf of Lukas Kranz: [zuul/zuul-jobs] 888021: Fix blockdiag issue https://review.opendev.org/c/zuul/zuul-jobs/+/888021 | 13:14 | |
| @fungicide:matrix.org | how does that work with merging, if you're proposing a pull request with the another pull request's topic branch as its target branch? you're not actually going to merge one pr into the other are you? zuul needs to know what branch each pr should merge to (the workflow you're describing is more akin to how gerrit works, github isn't really structured for the same kind of code review workflow as far as i've seen) | 14:52 |
| @fungicide:matrix.org | the reason this works with gerrit changes is that gerrit allows you to parent changes to one another directly while still tracking the same target branch for merging | 14:53 |
| @fungicide:matrix.org | as for merging multiple changes which depend on one another, instead of being forced to merge them individually in series you can tell zuul to merge them all at once semi-atomically, so as long as all of them are passing their jobs they can all merge, if at least one is failing then none can merge | 14:56 |
| @fungicide:matrix.org | https://www.zuul-ci.org/docs/zuul/latest/config/queue.html#attr-queue.allow-circular-dependencies | 14:57 |
| -@gerrit:opendev.org- James E. Blair https://matrix.to/#/@jim:acmegating.com proposed: [zuul/nodepool] 887907: Use low-level OpenStack SDK calls for server listing https://review.opendev.org/c/zuul/nodepool/+/887907 | 17:57 | |
| -@gerrit:opendev.org- James E. Blair https://matrix.to/#/@jim:acmegating.com proposed: [zuul/zuul] 887732: Add explicit foreign key indexes https://review.opendev.org/c/zuul/zuul/+/887732 | 19:46 | |
| -@gerrit:opendev.org- James E. Blair https://matrix.to/#/@jim:acmegating.com proposed on behalf of Simon Westphahl: [zuul/zuul] 650276: Keep task stdout/stderr separate in result object https://review.opendev.org/c/zuul/zuul/+/650276 | 21:27 | |
Generated by irclog2html.py 2.17.3 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!