[vdsm][RFC] reconsidering branching out ovirt-4.2

Hi all, It is time again to reconsider branching out the 4.2 stable branch. So far we decided to *not* branch out, and we are taking tags for ovirt 4.2 releases from master branch. This means we are merging safe and/or stabilization patches only in master. I think it is time to reconsider this decision and branch out for 4.2, because of two reasons: 1. it sends a clearer signal that 4.2 is going in stabilization mode 2. we have requests from virt team, which wants to start working on the next cycle features. If we decide to branch out, I'd start the new branch on monday, February 5 (1 week from now). The discussion is open, please share your acks/nacks for branching out, and for the branching date. I for myself I'm inclined to branch out, so if noone chimes in (!!) I'll execute the above plan. -- Francesco Romani Senior SW Eng., Virtualization R&D Red Hat IRC: fromani github: @fromanirh

On Mon, Jan 29, 2018 at 9:39 AM, Francesco Romani <fromani@redhat.com> wrote:
Hi all,
It is time again to reconsider branching out the 4.2 stable branch.
So far we decided to *not* branch out, and we are taking tags for ovirt 4.2 releases from master branch.
This means we are merging safe and/or stabilization patches only in master.
I think it is time to reconsider this decision and branch out for 4.2, because of two reasons:
1. it sends a clearer signal that 4.2 is going in stabilization mode
2. we have requests from virt team, which wants to start working on the next cycle features.
If we decide to branch out, I'd start the new branch on monday, February 5 (1 week from now).
The discussion is open, please share your acks/nacks for branching out, and for the branching date.
I for myself I'm inclined to branch out, so if noone chimes in (!!) I'll execute the above plan.
+1 from me, but FYI if not all projects or at least the important ones like ovirt-engine will do the same or add mapping from master to 4.2, like explained in the 4.2 thread on devel list, Then CI won't really work for 4.2, as it will probably need always newer engine version or other pkgs that only exists in master flow.
-- Francesco Romani Senior SW Eng., Virtualization R&D Red Hat IRC: fromani github: @fromanirh
_______________________________________________ Devel mailing list Devel@ovirt.org http://lists.ovirt.org/mailman/listinfo/devel
-- Eyal edri MANAGER RHV DevOps EMEA VIRTUALIZATION R&D Red Hat EMEA <https://www.redhat.com/> <https://red.ht/sig> TRIED. TESTED. TRUSTED. <https://redhat.com/trusted> phone: +972-9-7692018 irc: eedri (on #tlv #rhev-dev #rhev-integ)

On Mon, Jan 29, 2018 at 9:39 AM, Francesco Romani <fromani@redhat.com> wrote:
Hi all,
It is time again to reconsider branching out the 4.2 stable branch.
So far we decided to *not* branch out, and we are taking tags for ovirt 4.2 releases from master branch.
This means we are merging safe and/or stabilization patches only in master.
I think it is time to reconsider this decision and branch out for 4.2, because of two reasons:
1. it sends a clearer signal that 4.2 is going in stabilization mode
2. we have requests from virt team, which wants to start working on the next cycle features.
If we decide to branch out, I'd start the new branch on monday, February 5 (1 week from now).
The discussion is open, please share your acks/nacks for branching out, and for the branching date.
I for myself I'm inclined to branch out, so if noone chimes in (!!) I'll execute the above plan.
For network we don't see a lot of pending 4.2 work - except for the requirement to support el7.5. On the other hand, we too have already a patch for 4.3. Thus I'm fine with branching next week. When you do branch, please make sure to follow Barak Korren's request on the [ovirt-devel] [ACTION-REQUIRED] Making accurate CI for oVirt 4.2 thread.

On Mon, Jan 29, 2018 at 9:40 AM Francesco Romani <fromani@redhat.com> wrote:
Hi all,
It is time again to reconsider branching out the 4.2 stable branch.
So far we decided to *not* branch out, and we are taking tags for ovirt 4.2 releases from master branch.
This means we are merging safe and/or stabilization patches only in master.
I think it is time to reconsider this decision and branch out for 4.2, because of two reasons:
1. it sends a clearer signal that 4.2 is going in stabilization mode
2. we have requests from virt team, which wants to start working on the next cycle features.
This the only reason to branch out - "next cycle features" should be part of 4.2 as well? Do other teams also plan to push new features to 4.2 that are not stable yet? If not, I don't see any reason to branch out or backport "not stable" patches to 4.2 branch. We can keep it stable and avoid this branch-out unless we want to add new big feature that might cause regression in current stable 4.2 code.
If we decide to branch out, I'd start the new branch on monday, February 5 (1 week from now).
The discussion is open, please share your acks/nacks for branching out, and for the branching date.
I for myself I'm inclined to branch out, so if noone chimes in (!!) I'll execute the above plan.
-- Francesco Romani Senior SW Eng., Virtualization R&D Red Hat IRC: fromani github: @fromanirh
_______________________________________________ Devel mailing list Devel@ovirt.org http://lists.ovirt.org/mailman/listinfo/devel
-- Yaniv Bronhaim.

We agreed to branch out on Tuesday, February 6. After that, we will lift any restriction for patches in master branch: it is up to each team to decide which patches they want to submit, and which patches they want to backport, following the usual rules. E.g. nothing prevents anyone to submit refactoring or large changes to master *and* to propose them for backport to stable branch(es) later, following the usual steps. Bests, On 01/29/2018 08:39 AM, Francesco Romani wrote:
Hi all,
It is time again to reconsider branching out the 4.2 stable branch.
So far we decided to *not* branch out, and we are taking tags for ovirt 4.2 releases from master branch.
This means we are merging safe and/or stabilization patches only in master.
I think it is time to reconsider this decision and branch out for 4.2, because of two reasons:
1. it sends a clearer signal that 4.2 is going in stabilization mode
2. we have requests from virt team, which wants to start working on the next cycle features.
If we decide to branch out, I'd start the new branch on monday, February 5 (1 week from now).
The discussion is open, please share your acks/nacks for branching out, and for the branching date.
I for myself I'm inclined to branch out, so if noone chimes in (!!) I'll execute the above plan.
-- Francesco Romani Senior SW Eng., Virtualization R&D Red Hat IRC: fromani github: @fromanirh

In order to prevent the confusion of people which occurs in the middle of a work day not knowing whether their patches are included or not, Sandro and I will merge tonight. Team leads - please make sure to let your teams know that starting tomorrow morning all 4.2.2 Engine content should be backported into the stable branch as well On Fri, Feb 2, 2018 at 10:22 AM, Francesco Romani <fromani@redhat.com> wrote:
We agreed to branch out on Tuesday, February 6.
After that, we will lift any restriction for patches in master branch: it is up to each team to decide which patches they want to submit, and which patches they want to backport, following the usual rules.
E.g. nothing prevents anyone to submit refactoring or large changes to master *and* to propose them for backport to stable branch(es) later, following the usual steps.
Bests,
On 01/29/2018 08:39 AM, Francesco Romani wrote:
Hi all,
It is time again to reconsider branching out the 4.2 stable branch.
So far we decided to *not* branch out, and we are taking tags for ovirt 4.2 releases from master branch.
This means we are merging safe and/or stabilization patches only in master.
I think it is time to reconsider this decision and branch out for 4.2, because of two reasons:
1. it sends a clearer signal that 4.2 is going in stabilization mode
2. we have requests from virt team, which wants to start working on the next cycle features.
If we decide to branch out, I'd start the new branch on monday, February 5 (1 week from now).
The discussion is open, please share your acks/nacks for branching out, and for the branching date.
I for myself I'm inclined to branch out, so if noone chimes in (!!) I'll execute the above plan.
-- Francesco Romani Senior SW Eng., Virtualization R&D Red Hat IRC: fromani github: @fromanirh
_______________________________________________ Devel mailing list Devel@ovirt.org http://lists.ovirt.org/mailman/listinfo/devel
participants (5)
-
Dan Kenigsberg
-
Eyal Edri
-
Francesco Romani
-
Tal Nisan
-
Yaniv Bronheim