| rdogerrit | rdo-trunk created rdoinfo master: Promote CBS tags update for train-release https://review.rdoproject.org/r/c/rdoinfo/+/34253 | 00:21 |
|---|---|---|
| rdogerrit | rdo-trunk created rdoinfo master: Promote CBS tags update for train-8-release https://review.rdoproject.org/r/c/rdoinfo/+/34254 | 00:31 |
| rdogerrit | rdo-trunk proposed rdoinfo master: Promote CBS tags update for wallaby-8s-release https://review.rdoproject.org/r/c/rdoinfo/+/34204 | 00:35 |
| rdogerrit | wes hayutin created rdo-infra/ci-config master: WES [wip]Ruck/rover tool https://review.rdoproject.org/r/c/rdo-infra/ci-config/+/34255 | 03:59 |
| *** ykarel|away is now known as ykarel | 04:45 | |
| rdogerrit | Merged puppet/puppet-tripleo-distgit rpm-master: puppet-veritas_hyperscale is no longer required https://review.rdoproject.org/r/c/puppet/puppet-tripleo-distgit/+/34070 | 05:06 |
| rdogerrit | Takashi Kajinami proposed puppet/puppet-tripleo-distgit rpm-master: Remove unused puppet-midonet https://review.rdoproject.org/r/c/puppet/puppet-tripleo-distgit/+/34071 | 05:09 |
| rdogerrit | Takashi Kajinami proposed puppet/puppet-tripleo-distgit rpm-master: Remove puppet module for n1kv driver https://review.rdoproject.org/r/c/puppet/puppet-tripleo-distgit/+/34072 | 05:10 |
| tkajinam | ykarel, do you have any idea why changes to puppet-tripleo-distgit always conflict with each other ? | 05:10 |
| rdogerrit | Takashi Kajinami proposed puppet/puppet-tripleo-distgit rpm-master: puppet-sahara is no longer required https://review.rdoproject.org/r/c/puppet/puppet-tripleo-distgit/+/34246 | 05:10 |
| tkajinam | I manually rebased my changes every time I hit merge conflict but I don't see any conflict | 05:11 |
| ykarel | tkajinam, even if they are rebased over each other? | 05:11 |
| tkajinam | ykarel, I updated my patches so that one is based on another one | 05:11 |
| tkajinam | in a single chain | 05:11 |
| tkajinam | but afaik gerrit should be take care of auto rebase | 05:11 |
| tkajinam | * be able to take * | 05:11 |
| tkajinam | as long as git rebase works | 05:12 |
| tkajinam | I think something in rdo gerrit is different from openstack gerrit | 05:12 |
| tkajinam | anyway I created a chain of these patches instead of submitting them separately so this time we can merge them all cleanly, I believe... https://review.rdoproject.org/r/c/puppet/puppet-tripleo-distgit/+/34071 | 05:13 |
| ykarel | tkajinam, if one is rebased over other it should work fine | 05:15 |
| *** marios is now known as marios|ruck | 05:15 | |
| tkajinam | yeah | 05:15 |
| ykarel | and in gerrit the behavior is configurable | 05:15 |
| ykarel | tkajinam, it's defined at https://github.com/rdo-infra/review.rdoproject.org-config/blob/master/resources/puppet-generic.yaml#L29 | 05:22 |
| ykarel | that's the config param used | 05:22 |
| tkajinam | ahh | 05:23 |
| tkajinam | ok | 05:23 |
| ykarel | for some projects i know we do configure this way on purpose, like rdoinfo | 05:25 |
| ykarel | but for distgit's not sure, but seems auto rebases should work fine at least in rpm-master branches | 05:25 |
| ykarel | if it fails auto rebase, gerrit will show merge conflict due to rebase needed and that's fine | 05:26 |
| tkajinam | yeah but in my cases all patches could be rebased without any conflict | 05:27 |
| tkajinam | which still sounds strange | 05:27 |
| tkajinam | I guess auto rebase doesn't work for patches up for review(unless it is being merged) but I'll look into some details when I have time | 05:27 |
| tkajinam | I guess the current behavior is expected unless we enable merge commit | 05:27 |
| ykarel | yeap because it's configured that way so it's doing what we have directed, let's see if we can change those where ver possible | 05:28 |
| ykarel | amoralej|off, jpena|off may have more insights over the history ^, so we can discuss and act over it | 05:28 |
| tkajinam | ykarel, ack. thx | 05:28 |
| tkajinam | it's ok as long as I understand that's expected. I know there is a cons with enabling merge commit (it makes commit logs dirty at least) | 05:28 |
| ykarel | yes | 05:30 |
| ykarel | i will add topic to tomorrow's meeting in case we misses to discuss before | 05:31 |
| ykarel | https://etherpad.opendev.org/p/RDO-Meeting | 05:32 |
| tkajinam | thanks | 05:33 |
| rdogerrit | User bshewale proposed rdo-infra/ci-config master: Improvement in ppc containers manifest push design https://review.rdoproject.org/r/c/rdo-infra/ci-config/+/33815 | 05:59 |
| rdogerrit | Sandeep Yadav proposed rdo-infra/ci-config master: [wip]Ruck/rover tool https://review.rdoproject.org/r/c/rdo-infra/ci-config/+/34060 | 06:11 |
| *** ysandeep|out is now known as ysandeep | 06:11 | |
| rdogerrit | Merged puppet/puppet-tripleo-distgit rpm-master: Remove unused puppet-midonet https://review.rdoproject.org/r/c/puppet/puppet-tripleo-distgit/+/34071 | 07:02 |
| *** rpittau|afk is now known as rpittau | 07:06 | |
| *** amoralej|off is now known as amoralej | 07:14 | |
| rdogerrit | Sandeep Yadav proposed rdo-infra/ci-config master: [wip]Ruck/rover tool https://review.rdoproject.org/r/c/rdo-infra/ci-config/+/34060 | 07:34 |
| *** jpena|off is now known as jpena | 07:37 | |
| *** ykarel is now known as ykarel|lunch | 07:50 | |
| rdogerrit | User bshewale proposed rdo-infra/ci-config master: [WIP] Added enable_extended_hash config option https://review.rdoproject.org/r/c/rdo-infra/ci-config/+/34124 | 07:50 |
| rdogerrit | User bshewale proposed rdo-infra/ci-config master: Improvement in ppc containers manifest push design https://review.rdoproject.org/r/c/rdo-infra/ci-config/+/33815 | 07:52 |
| rdogerrit | Merged config master: Replace Jenkins secret, ensure they are not leaked https://review.rdoproject.org/r/c/config/+/34248 | 08:02 |
| rdogerrit | User bshewale proposed rdo-infra/ci-config master: [WIP] Added enable_extended_hash config option https://review.rdoproject.org/r/c/rdo-infra/ci-config/+/34124 | 08:09 |
| rdogerrit | User bshewale proposed rdo-infra/ci-config master: Improvement in ppc containers manifest push design https://review.rdoproject.org/r/c/rdo-infra/ci-config/+/33815 | 08:44 |
| *** ykarel|lunch is now known as ykarel | 09:08 | |
| rdogerrit | Luigi Toscano created openstack/cinder-distgit rpm-master: Fix the dependency on libcgroup-tools (no arch) https://review.rdoproject.org/r/c/openstack/cinder-distgit/+/34257 | 09:19 |
| rdogerrit | User bshewale proposed rdo-infra/ci-config master: Improvement in ppc containers manifest push design https://review.rdoproject.org/r/c/rdo-infra/ci-config/+/33815 | 09:25 |
| rdogerrit | Sandeep Yadav proposed rdo-infra/ci-config master: WES [wip]Ruck/rover tool https://review.rdoproject.org/r/c/rdo-infra/ci-config/+/34255 | 09:41 |
| rdogerrit | Merged puppet/puppet-tripleo-distgit rpm-master: Remove puppet module for n1kv driver https://review.rdoproject.org/r/c/puppet/puppet-tripleo-distgit/+/34072 | 09:44 |
| apevec[m] | ykarel: tkajinam - we wanted to avoid merges in distgits, linear git history is easier to read and bisect later | 10:06 |
| rdogerrit | Javier Peña created rdo-infra/ansible-role-dlrn master: Create dummy dlrn-deps.repo file if not present in role https://review.rdoproject.org/r/c/rdo-infra/ansible-role-dlrn/+/34258 | 10:08 |
| *** jcapitao is now known as jcapitao_lunch | 10:15 | |
| ykarel | apevec[m], you mean avoiding Merge commits? | 10:34 |
| ykarel | isn't with rebase those can be avoided | 10:35 |
| ykarel | i was looking at different options | 10:35 |
| ykarel | submit type. Valid values are 'fast forward only', 'merge if necessary', 'rebase if necessary', 'rebase always', 'merge always' and 'cherry pick'. The default is 'merge if necessary'. | 10:36 |
| ykarel | submit.action https://gerrit-review.googlesource.com/Documentation/config-project-config.html | 10:37 |
| jpena | ykarel: we have "rebase if necessary" configured for most repos | 11:02 |
| ykarel | jpena, but does it work with mergecontent = false? | 11:03 |
| jpena | ykarel: yes, I think those are unrelated | 11:03 |
| jpena | that's what I understand from https://gerrit-review.googlesource.com/Documentation/config-project-config.html | 11:04 |
| ykarel | jpena, so even with rebase if necessary, "Merge" commit get's created | 11:04 |
| jpena | no, I think merge commits are never created | 11:05 |
| ykarel | due to mergecontent = false or something else? | 11:06 |
| jpena | due to "rebase if necessary" in submit.action | 11:06 |
| jpena | hm | 11:07 |
| ykarel | but it's not auto rebasing even if there are no conflicts | 11:08 |
| jpena | I'm checking some other documentation, the the mergecontent option is explained better | 11:10 |
| jpena | "The content merge setting applies if the same files have been modified concurrently and tells Gerrit whether it should attempt a content merge for these files." | 11:11 |
| jpena | that seems reasonable | 11:11 |
| jpena | apevec, amoralej: wdyt? ^^ | 11:11 |
| amoralej | reading back | 11:11 |
| amoralej | one point is that | 11:13 |
| amoralej | we run different jobs in check and gate | 11:13 |
| amoralej | letmme check | 11:13 |
| amoralej | not that autorebasing means we may have different content in check and gate | 11:13 |
| amoralej | that's why we donn't want autorebase in rdoinfo i.e. | 11:14 |
| jpena | I'm thinking more about spec changes | 11:14 |
| *** dviroel|out is now known as dviroel | 11:20 | |
| amoralej | so i'd say "rebase if necessary" is what we want | 11:22 |
| amoralej | but iiuc the previous messages, gerrit is not trying to rebase | 11:22 |
| amoralej | even when there is no conflict? | 11:22 |
| amoralej | note that it says " merge will only succeed if there is no path conflict" | 11:23 |
| amoralej | path conflict | 11:23 |
| amoralej | that may mean that it does not try to resolve conflicts in the same file? | 11:23 |
| tkajinam | what I observed is that when this patch is merged https://review.rdoproject.org/r/c/puppet/puppet-tripleo-distgit/+/34070 | 11:30 |
| tkajinam | then https://review.rdoproject.org/r/c/puppet/puppet-tripleo-distgit/+/34071 was blocked because of merge conflict | 11:30 |
| tkajinam | I didn't see any conflict between these two. actually I rebased the second one on rpm-master after the first one is merged but git rebase worked without any conflict | 11:31 |
| jpena | amoralej: so "rebase is necessary" is fine. I'm talking about the other setting, "mergeContent = false" | 11:31 |
| jpena | apparently, when it is set to false, if two reviews change the same file it will show the merge conflict, even if it's possible to do "git rebase" without any conflict | 11:32 |
| amoralej | my question is if it will try to rebase on path coflicts if we enable mergecontent but set "rebase if necessary" | 11:32 |
| jpena | amoralej: my assumption is that it will | 11:33 |
| amoralej | but anyway, seems safe to enable | 11:33 |
| jpena | we can change it for one job and test it | 11:33 |
| amoralej | yes | 11:33 |
| jpena | I see we set it to false in our template for new distgit projects | 11:33 |
| apevec[m] | iirc Zuul works only with specific merge policy, can't find docs now | 11:33 |
| amoralej | jpena, so you want to set to true by default? | 11:34 |
| jpena | if our tests look right, yes | 11:34 |
| *** jpena is now known as jpena|lunch | 11:36 | |
| ykarel | in upstream i see mergeContent = true is set | 11:36 |
| ykarel | and action not set, so that defaults to merge if necessary | 11:36 |
| ykarel | in RDO, it's mergeContent = false for all except centos-opstools | 11:38 |
| ykarel | if we want to try changes, we can try on puppet-tripleo-distgit | 11:42 |
| ykarel | in collectd can see "Merge" commits https://github.com/centos-opstools/collectd/commits/master due to the current settings | 11:43 |
| ykarel | but seems with rebase if necessary those commits will not be there | 11:43 |
| *** jcapitao_lunch is now known as jcapitao | 11:51 | |
| *** ykarel_ is now known as ykarel | 12:02 | |
| *** amoralej is now known as amoralej|lunch | 12:28 | |
| *** ChanServ changes topic to "RDO: An OpenStack Distribution for CentOS/RHEL | Community meeting is held here in #rdo every Wednesday at 14:00UTC | Please read our IRC community guidelines: https://www.rdoproject.org/community/irc-etiquette/" | 12:29 | |
| *** jpena|lunch is now known as jpena | 12:31 | |
| rdogerrit | User bshewale proposed rdo-infra/ci-config master: [WIP] Added enable_extended_hash config option https://review.rdoproject.org/r/c/rdo-infra/ci-config/+/34124 | 12:33 |
| rdogerrit | Javier Peña created config master: Set mergeContent for puppet repos to true https://review.rdoproject.org/r/c/config/+/34259 | 12:35 |
| rdogerrit | Javier Peña created config master: [WIP] Set mergeContent=true for new distgit repos https://review.rdoproject.org/r/c/config/+/34260 | 12:37 |
| tosky | ... does this change of mine make sense? https://review.rdoproject.org/r/c/openstack/cinder-distgit/+/34257 | 12:40 |
| *** marios|ruck is now known as marios|ruck|call | 13:10 | |
| *** amoralej|lunch is now known as amoralej | 13:23 | |
| *** marios|ruck|call is now known as marios|ruck | 13:25 | |
| *** marios|ruck is now known as marios|ruck|call | 13:34 | |
| *** marios|ruck|call is now known as marios|ruck | 14:00 | |
| *** ykarel is now known as ykarel|away | 14:35 | |
| *** marios|ruck is now known as marios|ruck|call | 14:44 | |
| *** marios|ruck|call is now known as marios|ruck | 14:44 | |
| rdogerrit | mathieu bultel proposed openstack/validations-libs-distgit rpm-master: Add validation.cfg workaround https://review.rdoproject.org/r/c/openstack/validations-libs-distgit/+/34241 | 14:54 |
| rdogerrit | rdo-trunk created openstack/kolla-distgit wallaby-rdo: openstack-kolla-12.0.0-0.2.0rc2 https://review.rdoproject.org/r/c/openstack/kolla-distgit/+/34261 | 14:56 |
| *** ysandeep is now known as ysandeep|out | 14:57 | |
| *** marios|ruck is now known as marios|out | 16:00 | |
| rdogerrit | Joel Capitao created rdo-infra/weirdo master: WIP Push logs to log server https://review.rdoproject.org/r/c/rdo-infra/weirdo/+/34262 | 16:20 |
| rdogerrit | Joel Capitao proposed rdo-infra/weirdo master: Push logs to logserver.r.o instead of artifacts.c.o https://review.rdoproject.org/r/c/rdo-infra/weirdo/+/34262 | 16:25 |
| apevec[m] | next fun coming to Fedora Rawhide https://fedoraproject.org/wiki/Changes/Sphinx4 | 16:48 |
| apevec[m] | in the list of failing to build are novaclient and openstackclient | 16:48 |
| apevec[m] | Extension error (openstackdocstheme.ext): | 16:51 |
| apevec[m] | Handler <function _builder_inited at 0x7efc3093caf0> for event 'builder-inited' threw an exception (exception: make_link_role() missing 1 required positional argument: 'caption') | 16:51 |
| *** rpittau is now known as rpittau|afk | 17:11 | |
| rdogerrit | Amol Kahat proposed rdo-infra/ci-config master: Create python package for promoter server https://review.rdoproject.org/r/c/rdo-infra/ci-config/+/34201 | 17:25 |
| *** amoralej is now known as amoralej|off | 17:31 | |
| *** jpena is now known as jpena|off | 17:32 | |
| apevec[m] | only in Rawhide Bodhi updates are automatically created, right? | 17:36 |
| weshay|ruck | can someone please point me to which repo ansible is served from rdo https://github.com/redhat-openstack/rdoinfo/blob/684ad3c63d6d96619688ee4723be998c05b604a4/buildsys-tags/cloud8s-openstack-wallaby-testing.yml#L11-L13 | 17:45 |
| weshay|ruck | https://trunk.rdoproject.org/centos8-wallaby/deps/latest/x86_64/ | 17:45 |
| weshay|ruck | oh it's here https://trunk.rdoproject.org/centos8-wallaby/deps/latest/noarch/ | 17:45 |
| apevec | yes it is in deps, we cross tag cfgmgmt SIG builds | 17:47 |
| apevec | for cs9 it is our 2.9 rebuild | 17:48 |
| apevec | https://cbs.centos.org/koji/buildinfo?buildID=31572 | 17:49 |
| apevec | weshay|ruck, there are newer builds in CBS https://cbs.centos.org/koji/packageinfo?packageID=1947 if you need them, propose bump in rdoinfo | 17:49 |
| apevec | it will automatically cross-tag if NVR is in CBS | 17:50 |
| weshay|ruck | hitting /usr/lib/rpm/ansible-generator conflicts between attempted installs of ansible-2.9.21-1.el8.noarch and ansible-macros-2021.1.2-1.el8.noarch from tripleo-repos | 17:50 |
| weshay|ruck | trying to figure out where it's pulling from | 17:50 |
| apevec | where is .21 coming from? | 17:53 |
| apevec | we have .19 in deps | 17:54 |
| apevec | which repos are enabled? | 17:54 |
| weshay|ruck | ya.. it's a molecule test.. so the logging sucks.. running the invocation locally... still come up w/ 2.19 | 17:59 |
| weshay|ruck | tripleo-repos -b master ceph opstools current-tripleo --stream -d centos8 -o /tmp/wes | 17:59 |
| weshay|ruck | apevec, molecule has epel | 18:05 |
| weshay|ruck | sorry for the noise | 18:05 |
| apevec | np, yeah, always fun w/ epel - indeed epel8 currently has .21 and .22 in -candidate | 18:15 |
| *** iurygregory_ is now known as iurygregory | 18:39 | |
| rdogerrit | wes hayutin proposed rdo-infra/ci-config master: WES [wip]Ruck/rover tool https://review.rdoproject.org/r/c/rdo-infra/ci-config/+/34255 | 19:09 |
| rdogerrit | Sagi Shnaidman created rdo-infra/ci-config master: Create a default nginx config for toolbox https://review.rdoproject.org/r/c/rdo-infra/ci-config/+/34263 | 20:12 |
| *** dviroel is now known as dviroel|out | 20:59 | |
| rdogerrit | Merged rdo-infra/ci-config master: Create a default nginx config for toolbox https://review.rdoproject.org/r/c/rdo-infra/ci-config/+/34263 | 22:38 |
Generated by irclog2html.py 2.17.2 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!