Wednesday, 2023-03-15

*** gce108_ is now known as gce10801:02
*** elodilles is now known as elodilles_pto06:49
*** jpena|off is now known as jpena08:37
opendevreviewDr. Jens Harbott proposed openstack/project-config master: Fix approval check for post-review trigger  https://review.opendev.org/c/openstack/project-config/+/87745309:16
opendevreviewMerged openstack/project-config master: Fix approval check for post-review trigger  https://review.opendev.org/c/openstack/project-config/+/87745309:38
opendevreviewArtem Goncharov proposed openstack/project-config master: Add post-review pipeline reporting  https://review.opendev.org/c/openstack/project-config/+/87745810:37
opendevreviewMerged openstack/project-config master: Add post-review pipeline reporting  https://review.opendev.org/c/openstack/project-config/+/87745810:58
*** blarnath is now known as d34dh0r5312:23
*** jpena is now known as jpena|off17:42
opendevreviewIan Y. Choi proposed openstack/openstack-zuul-jobs master: Start translations for 2023.1 (Antelope) stable branch  https://review.opendev.org/c/openstack/openstack-zuul-jobs/+/87755019:56
gmannclarkb: frickler: fungi: stable/2023.2 job template change is ready now https://review.opendev.org/c/openstack/openstack-zuul-jobs/+/87305120:13
clarkbgmann: small thing inline but +2'd anyway20:17
fungioh, yeah inaccurate descriptions. good catch20:19
gmannfungi: clarkb: thanks, let me update as that complete line is not correct now because we use that template for stable branch also 20:19
opendevreviewGhanshyam proposed openstack/openstack-zuul-jobs master: Prepare the 2023.2 cycle testing job template  https://review.opendev.org/c/openstack/openstack-zuul-jobs/+/87305120:25
gmannclarkb: fungi ^^ updated20:26
opendevreviewJeremy Stanley proposed openstack/project-config master: Temporarily remove release docs semaphores  https://review.opendev.org/c/openstack/project-config/+/87755220:28
opendevreviewJeremy Stanley proposed openstack/project-config master: Revert "Temporarily remove release docs semaphores"  https://review.opendev.org/c/openstack/project-config/+/87755320:28
fungigmann: the new patchset to 873051 seems to mix the edits with a rebase, so i can't easily compare it to the previous version. was there a reason to rebase it? in the future, rebasing and editing as separate revisions is helpful to reviewers so they won't need to reread your entire change20:41
clarkbfungi: if it was rebased the gerrit web ui is filtering that uout20:41
clarkbhttps://review.opendev.org/c/openstack/openstack-zuul-jobs/+/873051/2..3/zuul.d/project-templates.yaml renders fine20:42
fungiyeah, it looks like the rebase didn't include new edits to that specific file, only to other files in the repo20:44
clarkbah20:44
fungiso i was able to skip to the project-templates file and follow the updates in it at least20:44
gmannlet me check20:45
fungii guess the gerrit webui spotted that, while basic git shows all the differences20:45
clarkbI think gerrit knows the old and new sides only changed that file so you don't care about any other deltas that show up from merges/rebases20:45
fungiyes, it seems like it's an optimization applied by gerrit's ui20:46
gmannI rebase to avoid any conflict or get latest changes as it was last updated long back20:47
clarkbgmann: if the rebase is clean without conflict then you don't need the rebase and zuul will test with the merged result20:47
clarkbzuul does a lot of the heavy lifting to ensure that you only need to rebase to resolve conflicts that git is incapable of handling on its own20:48
fungigit review will check it for you when you're submitting the change and tell you if there's a conflict20:48
fungiand yeah, otherwise rebasing "just to update" is unnecessary when testing with zuul20:49
fungithe change will be automatically merged to the current branch state when jobs are run20:49
fungibut yeah, if you `git diff refs/changes/51/873051/2 refs/changes/51/873051/3` you'll see the differences gerrit's ui is filtering out20:50
opendevreviewMerged openstack/openstack-zuul-jobs master: Prepare the 2023.2 cycle testing job template  https://review.opendev.org/c/openstack/openstack-zuul-jobs/+/87305120:51
clarkboh thats a good point. git-review also tries to help and tells you when a rebase is necessary. Otherwise just run git-review and it should be fine20:52
gmannsure20:56
gmannI usually check diff in UI and it filter out and if in same file it is lightly highlighted so we can know what is rebase change20:57
gmannbut I agree that we can avoid rebase unless conflict20:57
fungiprobably gertty could do some similar heuristics as the gerrit webui to not show interdiffs for files not changed by the revision selected, but today it's just straight git diff between the refs20:58

Generated by irclog2html.py 2.17.3 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!