| @iwienand:matrix.org | ahh right; i don't believe it includes an artifactory-like equivalent. i imagine what you'd be looking at is integrating with artifactory or similar via zuul-jobs | 00:01 |
|---|---|---|
| @aspiers:matrix.org | AFAIK this kind of save/restore of artifacts between runs is a very common requirement, at least in the JS and TS worlds where artifacts are usually ridiculously large amounts of data | 00:04 |
| @aspiers:matrix.org | In my project, this can reduce a CI run from (say) 6 minutes to 1 minute | 00:04 |
| @clarkb:matrix.org | Bazel can do this too. I'm not sure it makes a ton of sense to build directly into the CI system when it requires so much domain specific information. But totally doable to say have bazel do it and get the bazel zuul-jobs roles set up to support it | 00:07 |
| @clarkb:matrix.org | Which looks similar to what the GitHub actions cache is doing. It's a set of tools to configure and store the state on top of actions | 00:08 |
| -@gerrit:opendev.org- Zuul merged on behalf of James E. Blair https://matrix.to/#/@jim:acmegating.com: [zuul/zuul] 873645: Fix configuration error related to YAML anchors https://review.opendev.org/c/zuul/zuul/+/873645 | 00:47 | |
| -@gerrit:opendev.org- Simon Westphahl proposed: [zuul/zuul] 873681: Fix queue item creation in bundle deserialization https://review.opendev.org/c/zuul/zuul/+/873681 | 07:36 | |
| -@gerrit:opendev.org- Zuul merged on behalf of Clark Boylan: [zuul/zuul] 873049: Fix more file opening ResourceWarnings https://review.opendev.org/c/zuul/zuul/+/873049 | 07:51 | |
| @westphahl:matrix.org | Clark: approved the sqla stack | 07:57 |
| @tobias-urdin:matrix.org | hm it's not possible for nodepool to select an image based on an image tag right it's only name or ID? | 08:10 |
| -@gerrit:opendev.org- Simon Westphahl proposed: [zuul/zuul] 873691: Fix deprecated use of currentThread() in REPL https://review.opendev.org/c/zuul/zuul/+/873691 | 10:14 | |
| -@gerrit:opendev.org- Simon Westphahl proposed: [zuul/zuul] 873692: Fix missing None-check in cache key property https://review.opendev.org/c/zuul/zuul/+/873692 | 10:24 | |
| -@gerrit:opendev.org- Simon Westphahl proposed: [zuul/zuul] 873694: Fix exception on retry limit in Zuul source https://review.opendev.org/c/zuul/zuul/+/873694 | 10:28 | |
| -@gerrit:opendev.org- Benedikt Löffler proposed: [zuul/nodepool] 802255: Use optional upload script for uploading an image https://review.opendev.org/c/zuul/nodepool/+/802255 | 10:48 | |
| -@gerrit:opendev.org- Zuul merged on behalf of Clark Boylan: [zuul/zuul] 872034: Address SqlAlchemy Removed in 2.0 Warnings https://review.opendev.org/c/zuul/zuul/+/872034 | 12:58 | |
| -@gerrit:opendev.org- Zuul merged on behalf of Clark Boylan: [zuul/zuul] 872363: Don't nest alembic transactions https://review.opendev.org/c/zuul/zuul/+/872363 | 13:01 | |
| -@gerrit:opendev.org- Christian Mueller proposed wip: [zuul/nodepool] 869015: WIP: adding a testing container, which makes it easier to run unit tests locally in a container https://review.opendev.org/c/zuul/nodepool/+/869015 | 13:21 | |
| -@gerrit:opendev.org- Simon Westphahl proposed: [zuul/zuul] 873694: Fix exception on retry in source base class https://review.opendev.org/c/zuul/zuul/+/873694 | 14:09 | |
| -@gerrit:opendev.org- Christian Mueller proposed: [zuul/nodepool] 865531: WIP: enable EC2 Spot usage in AWS https://review.opendev.org/c/zuul/nodepool/+/865531 | 14:14 | |
| -@gerrit:opendev.org- Zuul merged on behalf of Clark Boylan: [zuul/zuul] 872044: Switch to sqlalchemy 2.0 https://review.opendev.org/c/zuul/zuul/+/872044 | 14:55 | |
| -@gerrit:opendev.org- Marvin Becker proposed: [zuul/nodepool] 873716: Add gpu support for k8s/openshift pods https://review.opendev.org/c/zuul/nodepool/+/873716 | 14:56 | |
| -@gerrit:opendev.org- Marvin Becker proposed: [zuul/nodepool] 873716: Add gpu support for k8s/openshift pods https://review.opendev.org/c/zuul/nodepool/+/873716 | 15:33 | |
| @jpew:matrix.org | mmm, I have a problem where all my deploy pipelines are failing with "MERGE_CONFLICT", does anyone know why? | 15:37 |
| @jpew:matrix.org | Could this be because of `merge-mode: cherry-pick` ? | 15:40 |
| @jpew:matrix.org | Yep..... that's the problem | 15:55 |
| @jpew:matrix.org | Ugh.... I think that's a big problem | 15:55 |
| @vonschultz:matrix.org | Yes, I think it's because of `merge-mode: cherry-pick`. As the `git cherry-pick` manual page states, "By default, cherry-picking an empty commit will fail," and I think that's what ends up happening if the commit has already landed. If my intuition is right here, adding the `--allow-empty` flag to the `git cherry-pick` command would fix it. | 16:11 |
| @vonschultz:matrix.org | It might be a simple matter of changing `repo.git.cherry_pick("FETCH_HEAD")` to `repo.git.cherry_pick("FETCH_HEAD", allow_empty=True)` in zuul/merger/merger.py. | 16:16 |
| @vonschultz:matrix.org | * It might be a simple matter of changing `repo.git.cherry_pick("FETCH_HEAD")` to `repo.git.cherry_pick("FETCH_HEAD", allow_empty=True)` in `zuul/merger/merger.py`. | 16:16 |
| @vonschultz:matrix.org | Another flag that might be interesting is `--keep-redundant-commits`, which has this description: "If a commit being cherry picked duplicates a commit already in the current history, it will become empty. By default these redundant commits cause cherry-pick to stop so the user can examine the commits cause cherry-pick to stop so the user can examine the commit object. Implies --allow-empty." That would then be `repo.git.cherry_pick("FETCH_HEAD", keep_redundant_commits=True)` in `merger.py`, if you want to try it. | 16:21 |
| @vonschultz:matrix.org | * Another flag that might be interesting is `--keep-redundant-commits`, which has this description: "If a commit being cherry picked duplicates a commit already in the current history, it will become empty. By default these redundant commits cause cherry-pick to stop so the user can examine the commit. This option overrides that behavior and creates an empty commit object. Implies --allow-empty." That would then be `repo.git.cherry_pick("FETCH_HEAD", keep_redundant_commits=True)` in `merger.py`, if you want to try it. | 16:22 |
| @clarkb:matrix.org | corvus: I'm paging https://review.opendev.org/c/zuul/zuul/+/872485 back in to review it (sorry I missed it when I was originally going through that stack). Did you end up deciding that ou prefer the != rather than the ordered comparison? | 17:36 |
| @clarkb:matrix.org | corvus: do you want to double check my comment on https://review.opendev.org/c/zuul/zuul/+/871100 to make sure that is actually a minor thing and not any worse than the current situation? | 18:18 |
| -@gerrit:opendev.org- Joshua Watt proposed: [zuul/zuul] 873742: merger: Keep redundant cherry-pick commits https://review.opendev.org/c/zuul/zuul/+/873742 | 18:20 | |
| @jpew:matrix.org | ^^ Christian von Schultz Looks like that was it. Thanks! | 18:21 |
| -@gerrit:opendev.org- Joshua Watt proposed: [zuul/zuul] 873742: merger: Keep redundant cherry-pick commits https://review.opendev.org/c/zuul/zuul/+/873742 | 18:22 | |
| -@gerrit:opendev.org- Zuul merged on behalf of Simon Westphahl: [zuul/zuul] 873691: Fix deprecated use of currentThread() in REPL https://review.opendev.org/c/zuul/zuul/+/873691 | 19:10 | |
| -@gerrit:opendev.org- Zuul merged on behalf of Simon Westphahl: [zuul/zuul] 873681: Fix queue item creation in bundle deserialization https://review.opendev.org/c/zuul/zuul/+/873681 | 20:55 | |
| -@gerrit:opendev.org- Zuul merged on behalf of James E. Blair https://matrix.to/#/@jim:acmegating.com: [zuul/zuul] 863569: Document pct_used_hdd stat https://review.opendev.org/c/zuul/zuul/+/863569 | 22:15 | |
| @clarkb:matrix.org | corvus not urgent but in reviewing https://review.opendev.org/c/zuul/zuul/+/811017 I noticed something from a while back we said should be fixed to be less confusing. Unfortunately, I'm not sure I understand the current state so not sure I can help fix that without some clarification but happy to do so if that can be clarified | 22:56 |
| @jim:acmegating.com | Clark: i'm sorry, i've been working on some very difficult problems all day, i'm not sure i have time to respond today. | 23:11 |
| @clarkb:matrix.org | no problem. I'm finding if I keep pulling on the thread I eventually get somewhere. Leaving notes for myself (and others) on that change. | 23:12 |
| -@gerrit:opendev.org- James E. Blair https://matrix.to/#/@jim:acmegating.com proposed: [zuul/zuul] 873832: DNM: Profile some dynamic layout operations https://review.opendev.org/c/zuul/zuul/+/873832 | 23:40 | |
Generated by irclog2html.py 2.17.3 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!