From: "Dan Kenigsberg" <danken(a)redhat.com&gt; To: "Francesco Romani" <fromani(a)redhat.com&gt; Cc: "Nir Soffer" <nsoffer(a)redhat.com&gt;, devel(a)ovirt.org Sent: Monday, October 10, 2016 5:11:26 PM Subject: Re: [vdsm] branch ovirt-4.0.5 created On Mon, Oct 10, 2016 at 10:30:49AM -0400, Francesco Romani wrote: > Hi everyone, > > this time I choose to create the ovirt-4.0.5 branch. > I already merged some patches for 4.0.6. > > Unfortunately I branched a bit too early (from last tag :)) > > So patches > https://gerrit.ovirt.org/#/c/65303/1 > https://gerrit.ovirt.org/#/c/65304/1 > https://gerrit.ovirt.org/#/c/65305/1 > > Should be trivially mergeable - the only thing changed from ovirt-4.0 > counterpart > is the change-id. Please have a quick look just to doublecheck. Change-Id should be the same for a master patch and all of its backport. It seems that it was NOT changed, at least for https://gerrit.ovirt.org/#/q/I5cea6ec71c913d74d95317ff7318259d64b40969 which is a GOOD thing.

I think we want to enable CI on the new 4.0.5 branch, right? Otherwise we'd need to fake the CI+1 flag until 4.0.5 is shipped.

On Mon, Oct 10, 2016 at 6:24 PM, Francesco Romani <fromani(a)redhat.com&gt; wrote: > ----- Original Message ----- > > From: "Dan Kenigsberg" <danken(a)redhat.com&gt; > > To: "Francesco Romani" <fromani(a)redhat.com&gt; > > Cc: "Nir Soffer" <nsoffer(a)redhat.com&gt;, devel(a)ovirt.org > > Sent: Monday, October 10, 2016 5:11:26 PM > > Subject: Re: [vdsm] branch ovirt-4.0.5 created > > > > On Mon, Oct 10, 2016 at 10:30:49AM -0400, Francesco Romani wrote: > > > Hi everyone, > > > > > > this time I choose to create the ovirt-4.0.5 branch. > > > I already merged some patches for 4.0.6. > > > > > > Unfortunately I branched a bit too early (from last tag :)) > > > > > > So patches > > > https://gerrit.ovirt.org/#/c/65303/1 > > > https://gerrit.ovirt.org/#/c/65304/1 > > > https://gerrit.ovirt.org/#/c/65305/1 > > > > > > Should be trivially mergeable - the only thing changed from ovirt-4.0 > > > counterpart > > > is the change-id. Please have a quick look just to doublecheck. > > > > Change-Id should be the same for a master patch and all of its backport. > > It seems that it was NOT changed, at least for > > https://gerrit.ovirt.org/#/q/I5cea6ec71c913d74d95317ff7318259d64b40969 > > which is a GOOD thing. > > Yes, sorry, indeed it is (and indeed it should not change). > > > I think we want to enable CI on the new 4.0.5 branch, right? Otherwise > > we'd need to fake the CI+1 flag until 4.0.5 is shipped. > > We should, but it is not urgently needed - just regular priority. > For the aforementioned first three patches especially I'm just overly > cautious. > > Was CI enabled for 4.0.5 branch? Adding infra as well. Shlomi, Did we enabled the regex for stable branch already and we don't need to manually update conf files? > -- > Francesco Romani > Red Hat Engineering Virtualization R & D > Phone: 8261328 > IRC: fromani > _______________________________________________ > Devel mailing list > Devel(a)ovirt.org > http://lists.ovirt.org/mailman/listinfo/devel > > > -- Eyal Edri Associate Manager RHV DevOps EMEA ENG Virtualization R&D Red Hat Israel phone: +972-9-7692018 irc: eedri (on #tlv #rhev-dev #rhev-integ)