From fromani at redhat.com Tue May 23 08:27:21 2017 Content-Type: multipart/mixed; boundary="===============3512697145519277113==" MIME-Version: 1.0 From: Francesco Romani To: devel at ovirt.org Subject: Re: [ovirt-devel] [vdsm] branching out 4.1.2 Date: Tue, 23 May 2017 10:27:17 +0200 Message-ID: In-Reply-To: CACuV_Hq6yg6qjDuhhf+5xnO7HL5jFxHKM_4ouYpK0RAuzpNw_g@mail.gmail.com --===============3512697145519277113== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable This is a multi-part message in MIME format. --------------27E0ADBF61E3BA881C5FCF40 Content-Type: text/plain; charset=3Dutf-8 Content-Transfer-Encoding: 7bit On 05/22/2017 12:32 PM, Eyal Edri wrote: > > > On Mon, May 22, 2017 at 1:11 PM, Yedidyah Bar David > wrote: > > On Mon, May 22, 2017 at 12:52 PM, Yaniv Kaul > wrote: > > > > > > On Mon, May 22, 2017 at 11:23 AM, Francesco Romani > > > > wrote: > >> > >> Hi all, > >> > >> > >> patches against the 4.1 branch are piling up, so I'm thinking about > >> branching out 4.1.2 tomorrow (20170523) > >> > >> The activity on the 4.1.2 front was quite low lately, so we should > >> expect quite few double backports. > >> > >> > >> Thoughts? I'll go forward and branch if noone objects. > > > > > > 1. Go for it. > > 2. Let's see what the outcome is. How many 'merge races' we > have, how many > > regressions (hopefully none), how much work is poured into it, > > Do you want for the new branch full CI coverage? = > > > I don't think it should, since the stable branch which is a superset > of it should all the patches as well and will fail > before backporting to the new branch. > > Yes, there might be rare occasions where a patch will fail on version > branch and not stable branch, > I'm not sure its worth the effort of duplicating all CI resources per > branch just for it. > We already don't cover all flows in CI because there are limited > resources, so I don't see a huge difference here. > > We can always run verification on the final bits via manual job before > releasing to catch such cases. I agree with Eyal. Furthermore 4.1.2 is released, so I expect low-to-none activity on that ovirt-4.1.2 branch. The merging activity on the branch ovirt-4.1 resumed, the merge window is now open again for 4.1.3. Bests, -- = Francesco Romani Senior SW Eng., Virtualization R&D Red Hat IRC: fromani github: @fromanirh --------------27E0ADBF61E3BA881C5FCF40 Content-Type: text/html; charset=3Dutf-8 Content-Transfer-Encoding: 7bit On 05/22/2017 12:32 PM, Eyal Edri wrote:


On Mon, May 22, 2017 at 1:11 PM, Yedidyah Bar David <didi(a)redhat.com> wrote:
On Mon, May 22, 2017 at 12:52 PM, Yaniv Kaul <ykaul(a)redhat.com> wrote= :
>
>
> On Mon, May 22, 2017 at 11:23 AM, Francesco Romani <fromani(a)redhat.com>
> wrote:
>>
>> Hi all,
>>
>>
>> patches against the 4.1 branch are piling up, so I'm thinking about
>> branching out 4.1.2 tomorrow (20170523)
>>
>> The activity on the 4.1.2 front was quite low lately, so we should
>> expect quite few double backports.
>>
>>
>> Thoughts? I'll go forward and branch if noone objects.
>
>
> 1. Go for it.
> 2. Let's see what the outcome is. How many 'merge races' we have, how many
> regressions (hopefully none), how much work is poured into it,

Do you want for the new branch full CI coverage?

I don't think it should, since the stable branch which is a superset of it should all the patches as well and will fail
before backporting to the new branch.

Yes, there might be rare occasions where a patch will fail on version branch and not stable branch,
I'm not sure its worth the effort of duplicating all CI resources per branch just for it.
We already don't cover all flows in CI because there are limited resources, so I don't see a huge difference here.

We can always run verification on the final bits via manual job before releasing to catch such cases.

I agree with Eyal. Furthermore 4.1.2 is released, so I expect low-to-none activity on that ovirt-4.1.2 branch.
The merging activity on the branch ovirt-4.1 resumed, the merge window is now open again for 4.1.3.

Bests,
-- =

Francesco Romani
Senior SW Eng., Virtualization R&D
Red Hat
IRC: fromani github: @fromanirh
--------------27E0ADBF61E3BA881C5FCF40-- --===============3512697145519277113== Content-Type: multipart/alternative MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="attachment.bin" VGhpcyBpcyBhIG11bHRpLXBhcnQgbWVzc2FnZSBpbiBNSU1FIGZvcm1hdC4KLS0tLS0tLS0tLS0t LS0yN0UwQURCRjYxRTNCQTg4MUM1RkNGNDAKQ29udGVudC1UeXBlOiB0ZXh0L3BsYWluOyBjaGFy c2V0PXV0Zi04CkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IDdiaXQKCk9uIDA1LzIyLzIwMTcg MTI6MzIgUE0sIEV5YWwgRWRyaSB3cm90ZToKPgo+Cj4gT24gTW9uLCBNYXkgMjIsIDIwMTcgYXQg MToxMSBQTSwgWWVkaWR5YWggQmFyIERhdmlkIDxkaWRpQHJlZGhhdC5jb20KPiA8bWFpbHRvOmRp ZGlAcmVkaGF0LmNvbT4+IHdyb3RlOgo+Cj4gICAgIE9uIE1vbiwgTWF5IDIyLCAyMDE3IGF0IDEy OjUyIFBNLCBZYW5pdiBLYXVsIDx5a2F1bEByZWRoYXQuY29tCj4gICAgIDxtYWlsdG86eWthdWxA cmVkaGF0LmNvbT4+IHdyb3RlOgo+ICAgICA+Cj4gICAgID4KPiAgICAgPiBPbiBNb24sIE1heSAy MiwgMjAxNyBhdCAxMToyMyBBTSwgRnJhbmNlc2NvIFJvbWFuaQo+ICAgICA8ZnJvbWFuaUByZWRo YXQuY29tIDxtYWlsdG86ZnJvbWFuaUByZWRoYXQuY29tPj4KPiAgICAgPiB3cm90ZToKPiAgICAg Pj4KPiAgICAgPj4gSGkgYWxsLAo+ICAgICA+Pgo+ICAgICA+Pgo+ICAgICA+PiBwYXRjaGVzIGFn YWluc3QgdGhlIDQuMSBicmFuY2ggYXJlIHBpbGluZyB1cCwgc28gSSdtIHRoaW5raW5nIGFib3V0 Cj4gICAgID4+IGJyYW5jaGluZyBvdXQgNC4xLjIgdG9tb3Jyb3cgKDIwMTcwNTIzKQo+ICAgICA+ Pgo+ICAgICA+PiBUaGUgYWN0aXZpdHkgb24gdGhlIDQuMS4yIGZyb250IHdhcyBxdWl0ZSBsb3cg bGF0ZWx5LCBzbyB3ZSBzaG91bGQKPiAgICAgPj4gZXhwZWN0IHF1aXRlIGZldyBkb3VibGUgYmFj a3BvcnRzLgo+ICAgICA+Pgo+ICAgICA+Pgo+ICAgICA+PiBUaG91Z2h0cz8gSSdsbCBnbyBmb3J3 YXJkIGFuZCBicmFuY2ggaWYgbm9vbmUgb2JqZWN0cy4KPiAgICAgPgo+ICAgICA+Cj4gICAgID4g MS4gR28gZm9yIGl0Lgo+ICAgICA+IDIuIExldCdzIHNlZSB3aGF0IHRoZSBvdXRjb21lIGlzLiBI b3cgbWFueSAnbWVyZ2UgcmFjZXMnIHdlCj4gICAgIGhhdmUsIGhvdyBtYW55Cj4gICAgID4gcmVn cmVzc2lvbnMgKGhvcGVmdWxseSBub25lKSwgaG93IG11Y2ggd29yayBpcyBwb3VyZWQgaW50byBp dCwKPgo+ICAgICBEbyB5b3Ugd2FudCBmb3IgdGhlIG5ldyBicmFuY2ggZnVsbCBDSSBjb3ZlcmFn ZT8gCj4KPgo+IEkgZG9uJ3QgdGhpbmsgaXQgc2hvdWxkLCBzaW5jZSB0aGUgc3RhYmxlIGJyYW5j aCB3aGljaCBpcyBhIHN1cGVyc2V0Cj4gb2YgaXQgc2hvdWxkIGFsbCB0aGUgcGF0Y2hlcyBhcyB3 ZWxsIGFuZCB3aWxsIGZhaWwKPiBiZWZvcmUgYmFja3BvcnRpbmcgdG8gdGhlIG5ldyBicmFuY2gu Cj4KPiBZZXMsIHRoZXJlIG1pZ2h0IGJlIHJhcmUgb2NjYXNpb25zIHdoZXJlIGEgcGF0Y2ggd2ls bCBmYWlsIG9uIHZlcnNpb24KPiBicmFuY2ggYW5kIG5vdCBzdGFibGUgYnJhbmNoLAo+IEknbSBu b3Qgc3VyZSBpdHMgd29ydGggdGhlIGVmZm9ydCBvZiBkdXBsaWNhdGluZyBhbGwgQ0kgcmVzb3Vy Y2VzIHBlcgo+IGJyYW5jaCBqdXN0IGZvciBpdC4KPiBXZSBhbHJlYWR5IGRvbid0IGNvdmVyIGFs bCBmbG93cyBpbiBDSSBiZWNhdXNlIHRoZXJlIGFyZSBsaW1pdGVkCj4gcmVzb3VyY2VzLCBzbyBJ IGRvbid0IHNlZSBhIGh1Z2UgZGlmZmVyZW5jZSBoZXJlLgo+Cj4gV2UgY2FuIGFsd2F5cyBydW4g dmVyaWZpY2F0aW9uIG9uIHRoZSBmaW5hbCBiaXRzIHZpYSBtYW51YWwgam9iIGJlZm9yZQo+IHJl bGVhc2luZyB0byBjYXRjaCBzdWNoIGNhc2VzLgoKSSBhZ3JlZSB3aXRoIEV5YWwuIEZ1cnRoZXJt b3JlIDQuMS4yIGlzIHJlbGVhc2VkLCBzbyBJIGV4cGVjdApsb3ctdG8tbm9uZSBhY3Rpdml0eSBv biB0aGF0IG92aXJ0LTQuMS4yIGJyYW5jaC4KVGhlIG1lcmdpbmcgYWN0aXZpdHkgb24gdGhlIGJy YW5jaCBvdmlydC00LjEgcmVzdW1lZCwgdGhlIG1lcmdlIHdpbmRvdwppcyBub3cgb3BlbiBhZ2Fp biBmb3IgNC4xLjMuCgpCZXN0cywKCi0tIApGcmFuY2VzY28gUm9tYW5pClNlbmlvciBTVyBFbmcu LCBWaXJ0dWFsaXphdGlvbiBSJkQKUmVkIEhhdApJUkM6IGZyb21hbmkgZ2l0aHViOiBAZnJvbWFu aXJoCgoKLS0tLS0tLS0tLS0tLS0yN0UwQURCRjYxRTNCQTg4MUM1RkNGNDAKQ29udGVudC1UeXBl OiB0ZXh0L2h0bWw7IGNoYXJzZXQ9dXRmLTgKQ29udGVudC1UcmFuc2Zlci1FbmNvZGluZzogN2Jp dAoKPGh0bWw+CiAgPGhlYWQ+CiAgICA8bWV0YSBodHRwLWVxdWl2PSJDb250ZW50LVR5cGUiIGNv bnRlbnQ9InRleHQvaHRtbDsgY2hhcnNldD11dGYtOCI+CiAgPC9oZWFkPgogIDxib2R5IHRleHQ9 IiMwMDAwMDAiIGJnY29sb3I9IiNGRkZGRkYiPgogICAgT24gMDUvMjIvMjAxNyAxMjozMiBQTSwg RXlhbCBFZHJpIHdyb3RlOjxicj4KICAgIDxibG9ja3F1b3RlIHR5cGU9ImNpdGUiCmNpdGU9Im1p ZDpDQUN1Vl9IcTZ5ZzZxakR1aGhmKzV4bk83SEw1akZ4SEtNXzRvdVlwSzBSQXV6cE53X2dAbWFp bC5nbWFpbC5jb20iPgogICAgICA8ZGl2IGRpcj0ibHRyIj48YnI+CiAgICAgICAgPGRpdiBjbGFz cz0iZ21haWxfZXh0cmEiPjxicj4KICAgICAgICAgIDxkaXYgY2xhc3M9ImdtYWlsX3F1b3RlIj5P biBNb24sIE1heSAyMiwgMjAxNyBhdCAxOjExIFBNLAogICAgICAgICAgICBZZWRpZHlhaCBCYXIg RGF2aWQgPHNwYW4gZGlyPSJsdHIiPiZsdDs8YQogICAgICAgICAgICAgICAgaHJlZj0ibWFpbHRv OmRpZGlAcmVkaGF0LmNvbSIgdGFyZ2V0PSJfYmxhbmsiCiAgICAgICAgICAgICAgICBtb3otZG8t bm90LXNlbmQ9InRydWUiPmRpZGlAcmVkaGF0LmNvbTwvYT4mZ3Q7PC9zcGFuPgogICAgICAgICAg ICB3cm90ZTo8YnI+CiAgICAgICAgICAgIDxibG9ja3F1b3RlIGNsYXNzPSJnbWFpbF9xdW90ZSIg c3R5bGU9Im1hcmdpbjowIDAgMAogICAgICAgICAgICAgIC44ZXg7Ym9yZGVyLWxlZnQ6MXB4ICNj Y2Mgc29saWQ7cGFkZGluZy1sZWZ0OjFleCI+PHNwYW4KICAgICAgICAgICAgICAgIGNsYXNzPSIi Pk9uIE1vbiwgTWF5IDIyLCAyMDE3IGF0IDEyOjUyIFBNLCBZYW5pdiBLYXVsCiAgICAgICAgICAg ICAgICAmbHQ7PGEgaHJlZj0ibWFpbHRvOnlrYXVsQHJlZGhhdC5jb20iCiAgICAgICAgICAgICAg ICAgIG1vei1kby1ub3Qtc2VuZD0idHJ1ZSI+eWthdWxAcmVkaGF0LmNvbTwvYT4mZ3Q7IHdyb3Rl Ojxicj4KICAgICAgICAgICAgICAgICZndDs8YnI+CiAgICAgICAgICAgICAgICAmZ3Q7PGJyPgog ICAgICAgICAgICAgICAgJmd0OyBPbiBNb24sIE1heSAyMiwgMjAxNyBhdCAxMToyMyBBTSwgRnJh bmNlc2NvIFJvbWFuaQogICAgICAgICAgICAgICAgJmx0OzxhIGhyZWY9Im1haWx0bzpmcm9tYW5p QHJlZGhhdC5jb20iCiAgICAgICAgICAgICAgICAgIG1vei1kby1ub3Qtc2VuZD0idHJ1ZSI+ZnJv bWFuaUByZWRoYXQuY29tPC9hPiZndDs8YnI+CiAgICAgICAgICAgICAgICAmZ3Q7IHdyb3RlOjxi cj4KICAgICAgICAgICAgICAgICZndDsmZ3Q7PGJyPgogICAgICAgICAgICAgICAgJmd0OyZndDsg SGkgYWxsLDxicj4KICAgICAgICAgICAgICAgICZndDsmZ3Q7PGJyPgogICAgICAgICAgICAgICAg Jmd0OyZndDs8YnI+CiAgICAgICAgICAgICAgICAmZ3Q7Jmd0OyBwYXRjaGVzIGFnYWluc3QgdGhl IDQuMSBicmFuY2ggYXJlIHBpbGluZyB1cCwKICAgICAgICAgICAgICAgIHNvIEknbSB0aGlua2lu ZyBhYm91dDxicj4KICAgICAgICAgICAgICAgICZndDsmZ3Q7IGJyYW5jaGluZyBvdXQgNC4xLjIg dG9tb3Jyb3cgKDIwMTcwNTIzKTxicj4KICAgICAgICAgICAgICAgICZndDsmZ3Q7PGJyPgogICAg ICAgICAgICAgICAgJmd0OyZndDsgVGhlIGFjdGl2aXR5IG9uIHRoZSA0LjEuMiBmcm9udCB3YXMg cXVpdGUgbG93CiAgICAgICAgICAgICAgICBsYXRlbHksIHNvIHdlIHNob3VsZDxicj4KICAgICAg ICAgICAgICAgICZndDsmZ3Q7IGV4cGVjdCBxdWl0ZSBmZXcgZG91YmxlIGJhY2twb3J0cy48YnI+ CiAgICAgICAgICAgICAgICAmZ3Q7Jmd0Ozxicj4KICAgICAgICAgICAgICAgICZndDsmZ3Q7PGJy PgogICAgICAgICAgICAgICAgJmd0OyZndDsgVGhvdWdodHM/IEknbGwgZ28gZm9yd2FyZCBhbmQg YnJhbmNoIGlmIG5vb25lCiAgICAgICAgICAgICAgICBvYmplY3RzLjxicj4KICAgICAgICAgICAg ICAgICZndDs8YnI+CiAgICAgICAgICAgICAgICAmZ3Q7PGJyPgogICAgICAgICAgICAgICAgJmd0 OyAxLiBHbyBmb3IgaXQuPGJyPgogICAgICAgICAgICAgICAgJmd0OyAyLiBMZXQncyBzZWUgd2hh dCB0aGUgb3V0Y29tZSBpcy4gSG93IG1hbnkgJ21lcmdlCiAgICAgICAgICAgICAgICByYWNlcycg d2UgaGF2ZSwgaG93IG1hbnk8YnI+CiAgICAgICAgICAgICAgICAmZ3Q7IHJlZ3Jlc3Npb25zICho b3BlZnVsbHkgbm9uZSksIGhvdyBtdWNoIHdvcmsgaXMKICAgICAgICAgICAgICAgIHBvdXJlZCBp bnRvIGl0LDxicj4KICAgICAgICAgICAgICAgIDxicj4KICAgICAgICAgICAgICA8L3NwYW4+RG8g eW91IHdhbnQgZm9yIHRoZSBuZXcgYnJhbmNoIGZ1bGwgQ0kgY292ZXJhZ2U/IDwvYmxvY2txdW90 ZT4KICAgICAgICAgICAgPGRpdj48YnI+CiAgICAgICAgICAgIDwvZGl2PgogICAgICAgICAgICA8 ZGl2PkkgZG9uJ3QgdGhpbmsgaXQgc2hvdWxkLCBzaW5jZSB0aGUgc3RhYmxlIGJyYW5jaCB3aGlj aAogICAgICAgICAgICAgIGlzIGEgc3VwZXJzZXQgb2YgaXQgc2hvdWxkIGFsbCB0aGUgcGF0Y2hl cyBhcyB3ZWxsIGFuZAogICAgICAgICAgICAgIHdpbGwgZmFpbDwvZGl2PgogICAgICAgICAgICA8 ZGl2PmJlZm9yZSBiYWNrcG9ydGluZyB0byB0aGUgbmV3IGJyYW5jaC48L2Rpdj4KICAgICAgICAg ICAgPGRpdj48YnI+CiAgICAgICAgICAgIDwvZGl2PgogICAgICAgICAgICA8ZGl2PlllcywgdGhl cmUgbWlnaHQgYmUgcmFyZSBvY2Nhc2lvbnMgd2hlcmUgYSBwYXRjaCB3aWxsCiAgICAgICAgICAg ICAgZmFpbCBvbiB2ZXJzaW9uIGJyYW5jaCBhbmQgbm90IHN0YWJsZSBicmFuY2gsPC9kaXY+CiAg ICAgICAgICAgIDxkaXY+SSdtIG5vdCBzdXJlIGl0cyB3b3J0aCB0aGUgZWZmb3J0IG9mIGR1cGxp Y2F0aW5nIGFsbCBDSQogICAgICAgICAgICAgIHJlc291cmNlcyBwZXIgYnJhbmNoIGp1c3QgZm9y IGl0LjwvZGl2PgogICAgICAgICAgICA8ZGl2PldlIGFscmVhZHkgZG9uJ3QgY292ZXIgYWxsIGZs b3dzIGluIENJIGJlY2F1c2UgdGhlcmUKICAgICAgICAgICAgICBhcmUgbGltaXRlZCByZXNvdXJj ZXMsIHNvIEkgZG9uJ3Qgc2VlIGEgaHVnZSBkaWZmZXJlbmNlCiAgICAgICAgICAgICAgaGVyZS48 L2Rpdj4KICAgICAgICAgICAgPGRpdj48YnI+CiAgICAgICAgICAgIDwvZGl2PgogICAgICAgICAg ICA8ZGl2PldlIGNhbiBhbHdheXMgcnVuIHZlcmlmaWNhdGlvbiBvbiB0aGUgZmluYWwgYml0cyB2 aWEKICAgICAgICAgICAgICBtYW51YWwgam9iIGJlZm9yZSByZWxlYXNpbmcgdG8gY2F0Y2ggc3Vj aCBjYXNlcy4gPGJyPgogICAgICAgICAgICA8L2Rpdj4KICAgICAgICAgIDwvZGl2PgogICAgICAg IDwvZGl2PgogICAgICA8L2Rpdj4KICAgIDwvYmxvY2txdW90ZT4KICAgIDxicj4KICAgIEkgYWdy ZWUgd2l0aCBFeWFsLiBGdXJ0aGVybW9yZSA0LjEuMiBpcyByZWxlYXNlZCwgc28gSSBleHBlY3QK ICAgIGxvdy10by1ub25lIGFjdGl2aXR5IG9uIHRoYXQgb3ZpcnQtNC4xLjIgYnJhbmNoLjxicj4K ICAgIFRoZSBtZXJnaW5nIGFjdGl2aXR5IG9uIHRoZSBicmFuY2ggb3ZpcnQtNC4xIHJlc3VtZWQs IHRoZSBtZXJnZQogICAgd2luZG93IGlzIG5vdyBvcGVuIGFnYWluIGZvciA0LjEuMy48YnI+CiAg ICA8YnI+CiAgICBCZXN0cyw8YnI+CiAgICA8cHJlIGNsYXNzPSJtb3otc2lnbmF0dXJlIiBjb2xz PSI3MiI+LS0gCkZyYW5jZXNjbyBSb21hbmkKU2VuaW9yIFNXIEVuZy4sIFZpcnR1YWxpemF0aW9u IFImYW1wO0QKUmVkIEhhdApJUkM6IGZyb21hbmkgZ2l0aHViOiBAZnJvbWFuaXJoPC9wcmU+CiAg PC9ib2R5Pgo8L2h0bWw+CgotLS0tLS0tLS0tLS0tLTI3RTBBREJGNjFFM0JBODgxQzVGQ0Y0MC0t Cg== --===============3512697145519277113==--