On 19 Jul 2016, at 14:25, Eyal Edri <eedri@redhat.com> wrote: =20 =20 =20 On Tue, Jul 19, 2016 at 1:37 PM, Michal Skrivanek <mskrivan@redhat.com = <mailto:mskrivan@redhat.com>> wrote: =20
On 19 Jul 2016, at 12:15, Eyal Edri <eedri@redhat.com = <mailto:eedri@redhat.com>> wrote: =20 This happened because you used the same bug for master and 4.0. =20 right, but that=E2=80=99s the regular state of things because upstream =
=20
The Gerrit hook doesn't verify status between major versions, only = inside a single version (for e.g, it would not move to modified if you = needed to backport to 4.0.1 and the target milestone was 4.0.1). I'm not sure how we can tackle this, because master has no meaning in = bugzilla, it doesn't correlate to a version. =20 One think I can think of, is NOT to move bugs to MODIFIED is a patch = was merged on master branch... , will that help?=20 =20 I=E2=80=99m not sure if it=E2=80=99s better because before 4.1 is = branched the master development is for 4.1 bugs. It would make sense to differentiate based on whether a branch for =
=20 I can't compare it to 4.0 because master is a moving target, so this = hook will misbehave once master change versions, I need a solid logic =
--Apple-Mail=_F66FE1C4-1AE3-42F0-8A02-36A7FD576C65 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 there is no separate bug for master vs current version that TM version exists or not, so in your above example since the bug = has TM 4.0.x and there is a 4.0 branch it would wait for a backport that will work all the time for bugs on master.
either not move them to MODIFIED if the bug is on target milestone !=3D = master (which is probably 100% of the times) or some regex we can use... = I don't have any other creative ideas=E2=80=A6
I guess if we have TM as x.y.z and the projects have x.y branch we can = check for that, right? if the branch is not there then master is the = final branch; if TM x.y.z matches some ovirt-x.y branch the backport is = needed.
=20 =20 On Tue, Jul 19, 2016 at 8:07 AM, Michal Skrivanek = <mskrivan@redhat.com <mailto:mskrivan@redhat.com>> wrote: Example in bug https://bugzilla.redhat.com/show_bug.cgi?id=3D1357440 = <https://bugzilla.redhat.com/show_bug.cgi?id=3D1357440> It doesn't take into account branches =20 Thanks, michal =20 =20 =20 --=20 Eyal Edri Associate Manager RHEV DevOps EMEA ENG Virtualization R&D Red Hat Israel =20 phone: +972-9-7692018 <tel:%2B972-9-7692018> irc: eedri (on #tlv #rhev-dev #rhev-integ) =20 =20 =20 =20 --=20 Eyal Edri Associate Manager RHEV DevOps EMEA ENG Virtualization R&D Red Hat Israel =20
You can look at the code if you want at [1] and see if you have an = idea. =20 [1] = https://gerrit.ovirt.org/gitweb?p=3Dgerrit-admin.git;a=3Dblob;f=3Dhooks/cu= stom_hooks/change-merged.set_MODIFIED;h=3D678806dc35a372dadab5a5a392d25409= db5c8275;hb=3Drefs/heads/master = <https://gerrit.ovirt.org/gitweb?p=3Dgerrit-admin.git;a=3Dblob;f=3Dhooks/c= ustom_hooks/change-merged.set_MODIFIED;h=3D678806dc35a372dadab5a5a392d2540= 9db5c8275;hb=3Drefs/heads/master> =20 =20 Thanks, michal =20 phone: +972-9-7692018 irc: eedri (on #tlv #rhev-dev #rhev-integ)
--Apple-Mail=_F66FE1C4-1AE3-42F0-8A02-36A7FD576C65 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8 <html><head><meta http-equiv=3D"Content-Type" content=3D"text/html = charset=3Dutf-8"></head><body style=3D"word-wrap: break-word; = -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" = class=3D""><br class=3D""><div><blockquote type=3D"cite" class=3D""><div = class=3D"">On 19 Jul 2016, at 14:25, Eyal Edri <<a = href=3D"mailto:eedri@redhat.com" class=3D"">eedri@redhat.com</a>> = wrote:</div><br class=3D"Apple-interchange-newline"><div class=3D""><br = class=3D"Apple-interchange-newline"><br style=3D"font-family: Helvetica; = font-size: 12px; font-style: normal; font-variant-caps: normal; = font-weight: normal; letter-spacing: normal; orphans: auto; text-align: = start; text-indent: 0px; text-transform: none; white-space: normal; = widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" = class=3D""><div class=3D"gmail_quote" style=3D"font-family: Helvetica; = font-size: 12px; font-style: normal; font-variant-caps: normal; = font-weight: normal; letter-spacing: normal; orphans: auto; text-align: = start; text-indent: 0px; text-transform: none; white-space: normal; = widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;">On = Tue, Jul 19, 2016 at 1:37 PM, Michal Skrivanek<span = class=3D"Apple-converted-space"> </span><span dir=3D"ltr" = class=3D""><<a href=3D"mailto:mskrivan@redhat.com" target=3D"_blank" = class=3D"">mskrivan@redhat.com</a>></span><span = class=3D"Apple-converted-space"> </span>wrote:<br = class=3D""><blockquote class=3D"gmail_quote" style=3D"margin: 0px 0px = 0px 0.8ex; border-left-width: 1px; border-left-style: solid; = border-left-color: rgb(204, 204, 204); padding-left: 1ex;"><div = style=3D"word-wrap: break-word;" class=3D""><br class=3D""><div = class=3D""><span class=3D""><blockquote type=3D"cite" class=3D""><div = class=3D"">On 19 Jul 2016, at 12:15, Eyal Edri <<a = href=3D"mailto:eedri@redhat.com" target=3D"_blank" = class=3D"">eedri@redhat.com</a>> wrote:</div><br class=3D""><div = class=3D""><div dir=3D"ltr" class=3D"">This happened because you used = the same bug for master and 4.0.</div></div></blockquote><div = class=3D""><br class=3D""></div></span>right, but that=E2=80=99s the = regular state of things because upstream there is no separate bug for = master vs current version</div><div class=3D""><span class=3D""><br = class=3D""><blockquote type=3D"cite" class=3D""><div class=3D""><div = dir=3D"ltr" class=3D""><div class=3D"">The Gerrit hook doesn't verify = status between major versions, only inside a single version (for e.g, it = would not move to modified if you needed to backport to 4.0.1 and the = target milestone was 4.0.1).</div><div class=3D"">I'm not sure how we = can tackle this, because master has no meaning in bugzilla, it doesn't = correlate to a version.</div><div class=3D""><br class=3D""></div><div = class=3D"">One think I can think of, is NOT to move bugs to MODIFIED is = a patch was merged on master branch... , will that = help? </div></div></div></blockquote><div class=3D""><br = class=3D""></div></span>I=E2=80=99m not sure if it=E2=80=99s better = because before 4.1 is branched the master development is for 4.1 = bugs.</div><div class=3D"">It would make sense to differentiate based on = whether a branch for that TM version exists or not, so in your above = example since the bug has TM 4.0.x and there is a 4.0 branch it would = wait for a backport</div></div></blockquote><div class=3D""><br = class=3D""></div><div class=3D"">I can't compare it to 4.0 because = master is a moving target, so this hook will misbehave once master = change versions, I need a solid logic that will work all the time for = bugs on master.</div><div class=3D"">either not move them to MODIFIED if = the bug is on target milestone !=3D master (which is probably 100% of = the times) or some regex we can use... I don't have any other creative = ideas=E2=80=A6</div></div></div></blockquote><div><br class=3D""></div>I = guess if we have TM as x.y.z and the projects have x.y branch we can = check for that, right? if the branch is not there then master is the = final branch; if TM x.y.z matches some ovirt-x.y branch the backport is = needed.</div><div><br class=3D""><blockquote type=3D"cite" class=3D""><div= class=3D""><div class=3D"gmail_quote" style=3D"font-family: Helvetica; = font-size: 12px; font-style: normal; font-variant-caps: normal; = font-weight: normal; letter-spacing: normal; orphans: auto; text-align: = start; text-indent: 0px; text-transform: none; white-space: normal; = widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;"><div = class=3D"">You can look at the code if you want at [1] and see if you = have an idea.</div><div class=3D""><br class=3D""></div><div = class=3D"">[1] <a = href=3D"https://gerrit.ovirt.org/gitweb?p=3Dgerrit-admin.git;a=3Dblob;f=3D= hooks/custom_hooks/change-merged.set_MODIFIED;h=3D678806dc35a372dadab5a5a3= 92d25409db5c8275;hb=3Drefs/heads/master" = class=3D"">https://gerrit.ovirt.org/gitweb?p=3Dgerrit-admin.git;a=3Dblob;f= =3Dhooks/custom_hooks/change-merged.set_MODIFIED;h=3D678806dc35a372dadab5a= 5a392d25409db5c8275;hb=3Drefs/heads/master</a></div><div = class=3D""> </div><blockquote class=3D"gmail_quote" style=3D"margin: = 0px 0px 0px 0.8ex; border-left-width: 1px; border-left-style: solid; = border-left-color: rgb(204, 204, 204); padding-left: 1ex;"><div = style=3D"word-wrap: break-word;" class=3D""><div class=3D""><br = class=3D""></div><div class=3D"">Thanks,</div><div = class=3D"">michal</div><span class=3D""><div class=3D""><br = class=3D""><blockquote type=3D"cite" class=3D""><div class=3D""><div = dir=3D"ltr" class=3D""><div class=3D""><br class=3D""></div></div><div = class=3D"gmail_extra"><br class=3D""><div class=3D"gmail_quote">On Tue, = Jul 19, 2016 at 8:07 AM, Michal Skrivanek<span = class=3D"Apple-converted-space"> </span><span dir=3D"ltr" = class=3D""><<a href=3D"mailto:mskrivan@redhat.com" target=3D"_blank" = class=3D"">mskrivan@redhat.com</a>></span><span = class=3D"Apple-converted-space"> </span>wrote:<br = class=3D""><blockquote class=3D"gmail_quote" style=3D"margin: 0px 0px = 0px 0.8ex; border-left-width: 1px; border-left-style: solid; = border-left-color: rgb(204, 204, 204); padding-left: 1ex;">Example in = bug<span class=3D"Apple-converted-space"> </span><a = href=3D"https://bugzilla.redhat.com/show_bug.cgi?id=3D1357440" = rel=3D"noreferrer" target=3D"_blank" = class=3D"">https://bugzilla.redhat.com/show_bug.cgi?id=3D1357440</a><br = class=3D"">It doesn't take into account branches<br class=3D""><br = class=3D"">Thanks,<br class=3D"">michal<br = class=3D""></blockquote></div><br class=3D""><br clear=3D"all" = class=3D""><div class=3D""><br class=3D""></div>--<span = class=3D"Apple-converted-space"> </span><br class=3D""><div = data-smartmail=3D"gmail_signature" class=3D""><div dir=3D"ltr" = class=3D""><div class=3D""><div dir=3D"ltr" class=3D""><div = class=3D"">Eyal Edri<br class=3D"">Associate Manager</div><div = class=3D"">RHEV DevOps<br class=3D"">EMEA ENG Virtualization R&D<br = class=3D"">Red Hat Israel<br class=3D""><br class=3D"">phone:<span = class=3D"Apple-converted-space"> </span><a = href=3D"tel:%2B972-9-7692018" value=3D"+97297692018" target=3D"_blank" = class=3D"">+972-9-7692018</a><br class=3D"">irc: eedri (on #tlv = #rhev-dev = #rhev-integ)</div></div></div></div></div></div></div></blockquote></div><= br class=3D""></span></div></blockquote></div><br style=3D"font-family: = Helvetica; font-size: 12px; font-style: normal; font-variant-caps: = normal; font-weight: normal; letter-spacing: normal; orphans: auto; = text-align: start; text-indent: 0px; text-transform: none; white-space: = normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: = 0px;" class=3D""><br clear=3D"all" style=3D"font-family: Helvetica; = font-size: 12px; font-style: normal; font-variant-caps: normal; = font-weight: normal; letter-spacing: normal; orphans: auto; text-align: = start; text-indent: 0px; text-transform: none; white-space: normal; = widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" = class=3D""><div style=3D"font-family: Helvetica; font-size: 12px; = font-style: normal; font-variant-caps: normal; font-weight: normal; = letter-spacing: normal; orphans: auto; text-align: start; text-indent: = 0px; text-transform: none; white-space: normal; widows: auto; = word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=3D""><br = class=3D""></div><span style=3D"font-family: Helvetica; font-size: 12px; = font-style: normal; font-variant-caps: normal; font-weight: normal; = letter-spacing: normal; orphans: auto; text-align: start; text-indent: = 0px; text-transform: none; white-space: normal; widows: auto; = word-spacing: 0px; -webkit-text-stroke-width: 0px; float: none; display: = inline !important;" class=3D"">--<span = class=3D"Apple-converted-space"> </span></span><br = style=3D"font-family: Helvetica; font-size: 12px; font-style: normal; = font-variant-caps: normal; font-weight: normal; letter-spacing: normal; = orphans: auto; text-align: start; text-indent: 0px; text-transform: = none; white-space: normal; widows: auto; word-spacing: 0px; = -webkit-text-stroke-width: 0px;" class=3D""><div class=3D"gmail_signature"= data-smartmail=3D"gmail_signature" style=3D"font-family: Helvetica; = font-size: 12px; font-style: normal; font-variant-caps: normal; = font-weight: normal; letter-spacing: normal; orphans: auto; text-align: = start; text-indent: 0px; text-transform: none; white-space: normal; = widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;"><div = dir=3D"ltr" class=3D""><div class=3D""><div dir=3D"ltr" class=3D""><div = class=3D"">Eyal Edri<br class=3D"">Associate Manager</div><div = class=3D"">RHEV DevOps<br class=3D"">EMEA ENG Virtualization R&D<br = class=3D"">Red Hat Israel<br class=3D""><br class=3D"">phone: = +972-9-7692018<br class=3D"">irc: eedri (on #tlv #rhev-dev = #rhev-integ)</div></div></div></div></div></div></blockquote></div><br = class=3D""></body></html>= --Apple-Mail=_F66FE1C4-1AE3-42F0-8A02-36A7FD576C65--