| -@gerrit:opendev.org- Zuul merged on behalf of James E. Blair https://matrix.to/#/@jim:acmegating.com: [zuul/zuul] 938344: Add information to start of job log https://review.opendev.org/c/zuul/zuul/+/938344 | 02:36 | |
| -@gerrit:opendev.org- James E. Blair https://matrix.to/#/@jim:acmegating.com proposed: | 03:15 | |
| - [zuul/zuul] 937210: Add an option to skip workspace checkouts https://review.opendev.org/c/zuul/zuul/+/937210 | ||
| - [zuul/zuul] 937211: Further reduce workspace checkouts https://review.opendev.org/c/zuul/zuul/+/937211 | ||
| - [zuul/zuul] 937212: Use empty sparse checkouts in mergers https://review.opendev.org/c/zuul/zuul/+/937212 | ||
| - [zuul/zuul] 937571: Parallelize workspace repo restoration https://review.opendev.org/c/zuul/zuul/+/937571 | ||
| -@gerrit:opendev.org- Zuul merged on behalf of James E. Blair https://matrix.to/#/@jim:acmegating.com: [zuul/zuul] 937818: Add images web ui https://review.opendev.org/c/zuul/zuul/+/937818 | 04:07 | |
| -@gerrit:opendev.org- Zuul merged on behalf of James E. Blair https://matrix.to/#/@jim:acmegating.com: [zuul/zuul] 937824: Add buttons to delete image upload https://review.opendev.org/c/zuul/zuul/+/937824 | 04:09 | |
| @bennetefx:matrix.org | Clark: Hi there, I just couldn't figure out why the prepare-workspace job/role is failing occasionally in my pipeline. I have 20 or more repositories that need to be synchronised and the size of these repositories amount to some 6-7 GB. Do you have any idea about this or have seen it before? | 06:24 |
|---|---|---|
| I have also seen a newer role i.e., prepare-workspace-git. I see everyone is preferring the new role, even in the latest zuul documentation prepare-workspace-git is being used. | ||
| The error log I am facing: | ||
| rsync: [receiver] open "/home/username/src/github.com/account-name/repository-name/.git/objects/fe/.~tmp~/f54dbf3cbec3c933ab31d18297cg3ea5df992cdf" failed: No such file or directory (2) | ||
| rsync: [receiver] open "/home/username/src/github.com/account-name/repository-name/.git/objects/ff/.~tmp~/8d1037155a305cbefc7fac247ea034ea53esss115" failed: No such file or directory (2) | ||
| rsync: [receiver] open "/home/username/src/github.com/account-name/repository-name/.git/objects/ff/.~tmp~/c653d2df1566cd1563a27caae927ebbc6se80e06" failed: No such file or directory (2) | ||
| rsync: [receiver] open "/home/username/src/github.com/account-name/repository-name/.git/objects/ff/.~tmp~/f8a6d30a1dd02c9b682c0415e71172seseb825f1e9" failed: No such file or directory (2) | ||
| rsync: [receiver] open "/home/username/src/github.com/account-name/repository-name/.git/objects/pack/.~tmp~/pack-0afaf75f6d71b43f16d5ee2eef32abee.idx" failed: No such file or directory (2) | ||
| rsync: [receiver] open "/home/username/src/github.com/account-name/repository-name/.git/objects/pack/.~tmp~/pack-0afaf75f6d71bd71b1962edef32abee.pack" failed: No such file or directory (2) | ||
| rsync: [receiver] open "/home/username/src/github.com/account-name/repository-name/.git/objects/pack/.~tmp~/pack-ab8d0997f5f66b9c8405dg6d8f6a816.idx" failed: No such file or directory (2) | ||
| rsync: [receiver] open "/home/username/src/github.com/account-name/repository-name/.git/objects/pack/.~tmp~/pack-ab8d0997f5166b9c84056d8f6a816.pack" failed: No such file or directory (2) | ||
| rsync: [receiver] open "/home/username/src/github.com/account-name/repository-name/.git/objects/pack/.~tmp~/pack-db83ad6f8afd51f748615793332d25a.idx" failed: No such file or directory (2) | ||
| rsync: [receiver] open "/home/username/src/github.com/account-name/repository-name/.git/objects/pack/.~tmp~/pack-db83ad6f86d581f7487b93332d25a.pack" failed: No such file or directory (2) | ||
| rsync error: some files/attrs were not transferred (see previous errors) (code 23) at main.c(1338) [sender=3.2.7] | ||
| @bennetefx:matrix.org | * Clark: Hi there, I just couldn't figure out why the prepare-workspace job/role is failing occasionally in my pipeline. I have 20 or more repositories that need to be synchronised and the size of these repositories amount to some 6-7 GB. Do you have any idea about this or have seen it before? | 06:25 |
| I have also seen a newer role i.e., prepare-workspace-git. I see everyone is preferring the new role, even in the latest zuul documentation prepare-workspace-git is being used. | ||
| The error log I am facing: | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/fe/.~tmp~/f54dbf33ab31d18297cg3ea5df992cdf" failed: No such file or directory (2) | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/ff/.~tmp~/8d1037155c7fac247ea034ea53esss115" failed: No such file or directory (2) | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/ff/.~tmp~/c653d2df15627caae927ebbc6se80e06" failed: No such file or directory (2) | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/ff/.~tmp~/f8a6d30a1dd0415e71172seseb825f1e9" failed: No such file or directory (2) | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/pack/.~tmp~/pack-0afab43f16d5ee2eef32abee.idx" failed: No such file or directory (2) | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/pack/.~tmp~/pack-0afad71b1962edef32abee.pack" failed: No such file or directory (2) | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/pack/.~tmp~/pack-ab8d09c8405dg6d8f6a816.idx" failed: No such file or directory (2) | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/pack/.~tmp~/pack-ab8d099c84056d8f6a816.pack" failed: No such file or directory (2) | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/pack/.~tmp~/pack-db83adf748615793332d25a.idx" failed: No such file or directory (2) | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/pack/.~tmp~/pack-db83ad6f86d593332d25a.pack" failed: No such file or directory (2) | ||
| rsync error: some files/attrs were not transferred (see previous errors) (code 23) at main.c(1338) \[sender=3.2.7\] | ||
| @bennetefx:matrix.org | * Clark: Hi there, I just couldn't figure out why the prepare-workspace job/role is failing occasionally in my pipeline. I have 20 or more repositories that need to be synchronised and the size of these repositories amount to some 6-7 GB. Do you have any idea about this or have seen it before? | 06:25 |
| I have also seen a newer role i.e., prepare-workspace-git. I see everyone is preferring the new role, even in the latest zuul documentation prepare-workspace-git is being used. | ||
| The error log I am facing: | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/fe/.~tmp~/f54dbf33ab31d18297cg3ea5df992cdf" failed: No such file or directory (2) | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/ff/.~tmp~/8d1037155c7fac247ea034ea53esss115" failed: No such file or directory (2) | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/ff/.~tmp~/c653d2df15627caae927ebbc6se80e06" failed: No such file or directory (2) | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/ff/.~tmp~/f8a6d30a1dd0415e71172seseb825f1e9" failed: No such file or directory (2) | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/pack/.~tmp~/pack-0afab43f16d5eeef32abee.idx" failed: No such file or directory (2) | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/pack/.~tmp~/pack-0afad71b1962edeabee.pack" failed: No such file or directory (2) | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/pack/.~tmp~/pack-ab8d09c8405dg8f6a816.idx" failed: No such file or directory (2) | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/pack/.~tmp~/pack-ab8d099c840566a816.pack" failed: No such file or directory (2) | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/pack/.~tmp~/pack-db83adf7486157332d25a.idx" failed: No such file or directory (2) | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/pack/.~tmp~/pack-db83ad6f86d5932d25a.pack" failed: No such file or directory (2) | ||
| rsync error: some files/attrs were not transferred (see previous errors) (code 23) at main.c(1338) \[sender=3.2.7\] | ||
| @bennetefx:matrix.org | * Clark: Hi there, I just couldn't figure out why the prepare-workspace job/role is failing occasionally in my pipeline. I have 20 or more repositories that need to be synchronised and the size of these repositories amount to some 6-7 GB. Do you have any idea about this or have seen it before? | 06:40 |
| I have also seen a newer role i.e., prepare-workspace-git. I see everyone is preferring the new role, even in the latest zuul documentation prepare-workspace-git is being used. | ||
| The error log I am facing: | ||
| ``` | ||
| @bennetefx:matrix.org | * Clark: Hi there, I just couldn't figure out why the prepare-workspace job/role is failing occasionally in my pipeline. I have 20 or more repositories that need to be synchronised and the size of these repositories amount to some 6-7 GB. Do you have any idea about this or have seen it before? | 06:41 |
| I have also seen a newer role i.e., prepare-workspace-git. I see everyone is preferring the new role, even in the latest zuul documentation prepare-workspace-git is being used. | ||
| The error log I am facing: | ||
| ``` | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/fe/.~tmp~/f54dbf33ab31d18297cg3ea5df992cdf" failed: No such file or directory (2) | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/ff/.~tmp~/8d1037155c7fac247ea034ea53esss115" failed: No such file or directory (2) | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/ff/.~tmp~/c653d2df15627caae927ebbc6se80e06" failed: No such file or directory (2) | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/ff/.~tmp~/f8a6d30a1dd0415e71172seseb825f1e9" failed: No such file or directory (2) | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/pack/.~tmp~/pack-0afab43f16d5eeef32abee.idx" failed: No such file or directory (2) | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/pack/.~tmp~/pack-0afad71b1962edeabee.pack" failed: No such file or directory (2) | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/pack/.~tmp~/pack-ab8d09c8405dg8f6a816.idx" failed: No such file or directory (2) | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/pack/.~tmp~/pack-ab8d099c840566a816.pack" failed: No such file or directory (2) | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/pack/.~tmp~/pack-db83adf7486157332d25a.idx" failed: No such file or directory (2) | ||
| rsync: \[receiver\] open "/home/username/src/github.com/account-name/repository-name/.git/objects/pack/.~tmp~/pack-db83ad6f86d5932d25a.pack" failed: No such file or directory (2) | ||
| rsync error: some files/attrs were not transferred (see previous errors) (code 23) at main.c(1338) \[sender=3.2.7\] | ||
| @joao15130:matrix.org | Clark: So I've test prepare-workspace-git and I have an issue again | 06:50 |
| 2025-01-17 06:44:28.491989 | controller -> localhost | "opendev.org/openstack/requirements": { | ||
| 2025-01-17 06:44:28.492036 | controller -> localhost | "dest": "/home/zuul/src/opendev.org/openstack/requirements", | ||
| 2025-01-17 06:44:28.492084 | controller -> localhost | "error": "Command '['git', 'push', '--quiet', '--mirror', 'git+ssh://zuul@10.228.237.212:22//home/zuul/src/opendev.org/openstack/requirements']' returned non-zero exit status 128. : b'Permission denied, please try again.\\r\\nPermission denied, please try again.\\r\\nzuul@10.228.237.212: Permission denied (publickey,password).\\r\\nfatal: Could not read from remote repository.\\n\\nPlease make sure you have the correct access rights\\nand the repository exists.\\n'", | ||
| @joao15130:matrix.org | * Clark: So I've test prepare-workspace-git and I have an issue again | 06:50 |
| 2025-01-17 06:44:28.491989 | controller -> localhost | "opendev.org/openstack/requirements": { | ||
| 2025-01-17 06:44:28.492036 | controller -> localhost | "dest": "/home/zuul/src/opendev.org/openstack/requirements", | ||
| 2025-01-17 06:44:28.492084 | controller -> localhost | "error": "Command '\['git', 'push', '--quiet', '--mirror', 'git+ssh://zuul@10.*.*.*:22//home/zuul/src/opendev.org/openstack/requirements'\]' returned non-zero exit status 128. : b'Permission denied, please try again.\\r\\nPermission denied, please try again.\\r\\nzuul@10.228.237.212: Permission denied (publickey,password).\\r\\nfatal: Could not read from remote repository.\\n\\nPlease make sure you have the correct access rights\\nand the repository exists.\\n'", | ||
| @mhuin:matrix.org | @zuul-maint here's a quick fix to sanitize autohold inputs https://review.opendev.org/c/zuul/zuul/+/938128 - if the argument passed as a ref filter cannot translate to a regex the autohold query is rejected, this will prevent errors later on when attempting to check if a build should be held or not. | 07:09 |
| @joao15130:matrix.org | I'm wondering which ssh key is used to connect with git+ssh, I have tested manual connection and for root and zuul user and it works just fine | 07:53 |
| @joao15130:matrix.org | wondering if I need to add the role aadd-build-sshkey before running the job | 08:01 |
| -@gerrit:opendev.org- Felix Edel proposed: | 08:03 | |
| - [zuul/zuul] 937876: Incorporate tenants stats in Toolbar section https://review.opendev.org/c/zuul/zuul/+/937876 | ||
| - [zuul/zuul] 938677: Summarize named queues in default (collapsed) view on status page https://review.opendev.org/c/zuul/zuul/+/938677 | ||
| -@gerrit:opendev.org- Felix Edel proposed: [zuul/zuul] 939516: Reduce font-size used for the pipeline name https://review.opendev.org/c/zuul/zuul/+/939516 | 08:19 | |
| -@gerrit:opendev.org- Felix Edel proposed: | 08:27 | |
| - [zuul/zuul] 937876: Incorporate tenants stats in Toolbar section https://review.opendev.org/c/zuul/zuul/+/937876 | ||
| - [zuul/zuul] 938677: Summarize named queues in default (collapsed) view on status page https://review.opendev.org/c/zuul/zuul/+/938677 | ||
| @joao15130:matrix.org | yeah that was it, adding a pre-job including role add-build-sshkey did the trick. I guess it was the solution to syncrhonize as well | 08:42 |
| -@gerrit:opendev.org- Simon Westphahl proposed: [zuul/zuul] 933215: Clarify retry(-limit) build status docs https://review.opendev.org/c/zuul/zuul/+/933215 | 08:53 | |
| @newbie23:matrix.org | Hello guys, | 10:32 |
| given a Zuul CI + GitHub deployment and " exclude-unprotected-branches: true" at tenant level, | ||
| if I have two repositories | ||
| foo (with code) with <protected>master, <protected>dev, <protected>testing branches and | ||
| foo_config (with Zuul configuration items) with <protected> master, dev and testing (so no GitHub protection on dev and testing for this repo, but the branch names match the foo protected branches), | ||
| are Zuul configuration items (e.g. jobs) stored in foo_config@dev and foo_config@testing considered for the job freeze? | ||
| @joao15130:matrix.org | Hello, I'm running into a new issue with Zuul. My job is failing because of a DISK_FULL and I have plenty of free space on the host. | 11:20 |
| I have observed some weird messages in the executor logs like below: | ||
| WARNING zuul.ExecutorDiskAccountant: /var/lib/zuul/builds/1615a38aef954609b5899f8af5c1dfdf is using 504MB (limit=250) | ||
| any idea? | ||
| @dfajfer:fsfe.org | executor.disk_limit_per_job is by default 250MB | 11:22 |
| @dfajfer:fsfe.org | You havent changed it in your config so it breaks when your repo is bigger than that | 11:22 |
| @dfajfer:fsfe.org | its in zuul.conf | 11:22 |
| @joao15130:matrix.org | ok | 11:22 |
| @dfajfer:fsfe.org | https://zuul-ci.org/docs/zuul/latest/configuration.html#attr-executor.disk_limit_per_job | 11:22 |
| @joao15130:matrix.org | How do I put it into zuul.conf? | 11:24 |
| @joao15130:matrix.org | under [executor]? | 11:24 |
| @dfajfer:fsfe.org | you surely must have defined it somewhere | 11:24 |
| @dfajfer:fsfe.org | ah, yea | 11:25 |
| @joao15130:matrix.org | disk_limit_per_job=xxx | 11:25 |
| @dfajfer:fsfe.org | exactly | 11:25 |
| @joao15130:matrix.org | ok thks | 11:25 |
| @joao15130:matrix.org | is there any space for Nodepool question or I can ask here? | 11:29 |
| @dfajfer:fsfe.org | it's just this channel IIRC | 11:34 |
| @joao15130:matrix.org | ok | 11:46 |
| @joao15130:matrix.org | As of now I use static VMs on which I deploy devstack and run tempest, it takes time as it needs to install devstack, run tempest then unstack for the next run. Can nodepool be better in increasing the speed of the process and how? | 11:47 |
| -@gerrit:opendev.org- Zuul merged on behalf of Simon Westphahl: [zuul/zuul] 933215: Clarify retry(-limit) build status docs https://review.opendev.org/c/zuul/zuul/+/933215 | 12:05 | |
| -@gerrit:opendev.org- Simon Westphahl proposed: [zuul/zuul] 939527: Don't cancel completed build requests https://review.opendev.org/c/zuul/zuul/+/939527 | 13:04 | |
| @fungicide:matrix.org | joao15130: if you use nodepool you can generate images periodically with a cache of your git repos, so that only recent deltas have to be copied to nodes booted from them just before each build. also there would be no need to unstack since the vm simply gets deleted after the build | 13:25 |
| @joao15130:matrix.org | ok so it'll be quicker and we would be able to avoid spending time on building devstack vm each time a job is triggered. Is my assumption correct? | 13:26 |
| @dfajfer:fsfe.org | > <@fungicide:matrix.org> joao15130: if you use nodepool you can generate images periodically with a cache of your git repos, so that only recent deltas have to be copied to nodes booted from them just before each build. also there would be no need to unstack since the vm simply gets deleted after the build | 13:27 |
| you just put that into directory where it would clone the files? or there's some procedure for caching git repos | ||
| @dfajfer:fsfe.org | didn't know it's supported so never bothered | 13:27 |
| @dfajfer:fsfe.org | > <@fungicide:matrix.org> joao15130: if you use nodepool you can generate images periodically with a cache of your git repos, so that only recent deltas have to be copied to nodes booted from them just before each build. also there would be no need to unstack since the vm simply gets deleted after the build | 13:27 |
| * you just put that into directory where it would clone the files prior to the build? or there's some procedure for caching git repos | ||
| @fungicide:matrix.org | joao15130: i wouldn't recommend pre-installing devstack if you're testing patches for openstack repositories, since you want it starting up the patched service(s) | 13:29 |
| @joao15130:matrix.org | ok so keep the static vm provider then? | 13:31 |
| @fungicide:matrix.org | dfajfer: in opendev we put ours in /opt/git and tell zuul to use that as a cache when preparing the workspace | 13:36 |
| @fungicide:matrix.org | joao15130: i didn't say keep the static setup (it's actually a terrible idea because devstack can/will corrupt those nodes over time, you're running arbitrary code there with root privs from untrusted patches proposed in opendev's gerrit by anyone who wants to upload them) | 13:37 |
| @fungicide:matrix.org | using nodepool ensures you start every build from a fresh, untainted vm | 13:38 |
| @joao15130:matrix.org | ok so nodepool builds vm with fresh devstack in the backgound | 13:38 |
| @fungicide:matrix.org | so you don't have to worry about a prior build contaminating your test results | 13:38 |
| @joao15130:matrix.org | and when one job is triggered nodepool picks up one vm to use ? | 13:38 |
| @fungicide:matrix.org | devstack still gets installed during job runtime, not preinstalled in your node images | 13:39 |
| @fungicide:matrix.org | but yes, zuul asks nodepool to assign one or more appropriate nodes for a build. if nodepool already has some ready then it hands them off immediately, otherwise zuul waits for nodepool to launch the requested vms | 13:40 |
| @joao15130:matrix.org | ok | 13:41 |
| @joao15130:matrix.org | so it can reduce the job time | 13:41 |
| @joao15130:matrix.org | if a vm is available | 13:41 |
| @joao15130:matrix.org | any good documentation to start with? | 13:41 |
| @fungicide:matrix.org | https://zuul-ci.org/docs/nodepool | 13:46 |
| @fungicide:matrix.org | i don't know that it will necessarily reduce your run time, but it will give you cleaner test results and save you from constantly debugging problems introduced onto your static nodes by previous job runs | 13:47 |
| @joao15130:matrix.org | ok thanks. that was roughly my understanding | 13:47 |
| @dfajfer:fsfe.org | > <@fungicide:matrix.org> dfajfer: in opendev we put ours in /opt/git and tell zuul to use that as a cache when preparing the workspace | 14:00 |
| so you just set up executor.[job,git]_dir attributes to /opt/git and it's the cache? sry, I'm having a cold today might be a lil slow today | ||
| @fungicide:matrix.org | dfajfer: https://zuul-ci.org/docs/zuul-jobs/latest/general-roles.html#rolevar-prepare-workspace-git.cached_repos_root | 14:03 |
| @dfajfer:fsfe.org | cool, and basically it should be the same value as https://zuul-ci.org/docs/zuul/latest/configuration.html#attr-executor.git_dir if I understand correctly? | 14:04 |
| @fungicide:matrix.org | doesn't have to be, i don't think. one is on your remote job nodes, the other is on your executors | 14:07 |
| -@gerrit:opendev.org- James E. Blair https://matrix.to/#/@jim:acmegating.com proposed: | 14:17 | |
| - [zuul/zuul] 937211: Further reduce workspace checkouts https://review.opendev.org/c/zuul/zuul/+/937211 | ||
| - [zuul/zuul] 937212: Use empty sparse checkouts in mergers https://review.opendev.org/c/zuul/zuul/+/937212 | ||
| - [zuul/zuul] 937571: Parallelize workspace repo restoration https://review.opendev.org/c/zuul/zuul/+/937571 | ||
| -@gerrit:opendev.org- Zuul merged on behalf of Simon Westphahl: | 14:35 | |
| - [zuul/zuul] 939208: Avoid lost events when aborting event processing https://review.opendev.org/c/zuul/zuul/+/939208 | ||
| - [zuul/zuul] 939201: Don't invalidate zk context on stop event https://review.opendev.org/c/zuul/zuul/+/939201 | ||
| @mhuin:matrix.org | @zuul-maint I've changed the autohold_if_failure var into "autohold_matches" ie a list of autohold request ids that would trigger on a job, in https://review.opendev.org/c/zuul/zuul/+/937895 - is that more acceptable? | 14:37 |
| -@gerrit:opendev.org- Zuul merged on behalf of James E. Blair https://matrix.to/#/@jim:acmegating.com: [zuul/zuul] 937946: Add image/upload delete lifecycle https://review.opendev.org/c/zuul/zuul/+/937946 | 15:45 | |
| @mnaser:matrix.org | Welp, I'm getting the merge conflict on changes again that rebase just fine locally, show no merge conflicts in git: https://review.vexxhost.dev/c/atmosphere/+/256 -- am I missing something here, is there something i can dig up to try and troubleshoot this issue and fi xit | 20:04 |
| @mnaser:matrix.org | interestingly enough the failed merges are being reported on the build and not entire buildset, but i think this is because im using requires/provdies now -- atmosphere-docs https://ci.atmosphere.dev/t/atmosphere/build/85dbba6cd72047c195eb74c011e9abae : MERGE_CONFLICT in 0s | 20:05 |
| @mnaser:matrix.org | also btw i am working on writing a role to build docker images with buildah (benefit of rootless + now it can easily do multiplatform + we can just push it to the local daemon without having to do the whole build twice dance cause docker doesnt support multiarch manfiests locally | 20:19 |
| @mnaser:matrix.org | https://review.opendev.org/c/zuul/zuul-jobs/+/915025 would really make the code a lot cleaner :) | 20:20 |
| @fungicide:matrix.org | mnaser: according to https://zuul-ci.org/docs/zuul/latest/config/project.html#attr-project.merge-mode the default merge strategy for the gerrit driver is resolve, so you may need to specify it in the command line when trying to reproduce the merge conflict locally | 20:33 |
| @mnaser:matrix.org | ah, we moved to gerrit recently, i think the merge-mode is actually the thing that might be causing the conflict, i thought that was just used by github/gitlab! oops | 20:34 |
| @fungicide:matrix.org | yeah, it varies by driver because different code hosting/review systems have different merge strategies themselves, so zuul tries to pick a strategy in cgit which most closely matches what the target system is likely to do | 20:38 |
| @fungicide:matrix.org | looks like it's nearly done | 20:45 |
| @fungicide:matrix.org | er, wrong channel | 20:45 |
| @vlotorev:matrix.org | mnaser: zuul executor provides workspace-repos.json file with all git merge commands. This file is available in logs directory, e.g. https://zuul.opendev.org/t/zuul/build/66e27094b182446d9824f9790e2e485f/logs | 21:56 |
| workspace-repos.json can be replayed locally with some script from ’scripts' directory from zuul repo. | ||
| @vlotorev:matrix.org | * @mnaser:matrix.org: zuul executor provides workspace-repos.json file with all git merge commands. This file is available in logs directory, e.g. https://zuul.opendev.org/t/zuul/build/66e27094b182446d9824f9790e2e485f/logs. | 21:56 |
| workspace-repos.json can be replayed locally with some script from ’scripts' directory from zuul repo. | ||
| @mnaser:matrix.org | That’s super handy, thanks vlotorev I will for sure need to check this out locally. | 21:57 |
| @vlotorev:matrix.org | Also I saw merge-conflict reports from zuul if Gerrit topics are modified after zuul started freezing jobs. | 22:00 |
| @clarkb:matrix.org | that should only happen if you are using same topic merge with cycles enabled | 22:11 |
| @clarkb:matrix.org | which isn't the default for gerrit or zuul (just want to point out its a very specific case that can happen under) | 22:11 |
Generated by irclog2html.py 2.17.3 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!