Vdsm branch ovirt-4.3 created

Hi, I created ovirt-4.3 branch. That means patches for 4.3 must be backported from master since now. Not everything regarding CI is ready yet, but until we make the branch, we can't make some things working nor prove they are working. We need the branch to move forward. *Please don't merge non-4.3 patches to master yet.* Let's make 4.3 backports completely safe and trivial for a while, until we have working CI on 4.3. I'm not particularly happy with the branching process, let's use this experience to improve it next time. At minimum some guidelines should exist rather than just "common knowledge" with missing bits and pieces. Thanks, Milan

On Tue, Feb 26, 2019 at 1:24 PM Milan Zamazal <mzamazal@redhat.com> wrote:
Hi,
I created ovirt-4.3 branch. That means patches for 4.3 must be backported from master since now.
Not everything regarding CI is ready yet, but until we make the branch, we can't make some things working nor prove they are working. We need the branch to move forward.
*Please don't merge non-4.3 patches to master yet.* Let's make 4.3 backports completely safe and trivial for a while, until we have working CI on 4.3.
I'm not particularly happy with the branching process, let's use this experience to improve it next time. At minimum some guidelines should exist rather than just "common knowledge" with missing bits and pieces.
One of the "common knowledge" items is that immediately after you merge a post-branchout patch to master, you should tag it (with v4.40).
Thanks, Milan

Dan Kenigsberg <danken@redhat.com> writes:
On Tue, Feb 26, 2019 at 1:24 PM Milan Zamazal <mzamazal@redhat.com> wrote:
Hi,
I created ovirt-4.3 branch. That means patches for 4.3 must be backported from master since now.
Not everything regarding CI is ready yet, but until we make the branch, we can't make some things working nor prove they are working. We need the branch to move forward.
*Please don't merge non-4.3 patches to master yet.* Let's make 4.3 backports completely safe and trivial for a while, until we have working CI on 4.3.
I'm not particularly happy with the branching process, let's use this experience to improve it next time. At minimum some guidelines should exist rather than just "common knowledge" with missing bits and pieces.
One of the "common knowledge" items is that immediately after you merge a post-branchout patch to master, you should tag it (with v4.40).
Yes, https://gerrit.ovirt.org/97841 would be a good patch to start new master with.

On Tue, Feb 26, 2019 at 1:37 PM Milan Zamazal <mzamazal@redhat.com> wrote:
Dan Kenigsberg <danken@redhat.com> writes:
On Tue, Feb 26, 2019 at 1:24 PM Milan Zamazal <mzamazal@redhat.com> wrote:
Hi,
I created ovirt-4.3 branch. That means patches for 4.3 must be backported from master since now.
Not everything regarding CI is ready yet, but until we make the branch, we can't make some things working nor prove they are working. We need the branch to move forward.
*Please don't merge non-4.3 patches to master yet.*
Do we plan to rebase on master after initial testing?
Let's make 4.3 backports completely safe and trivial for a while, until we have working CI on 4.3.
I'm not particularly happy with the branching process, let's use this experience to improve it next time. At minimum some guidelines should exist rather than just "common knowledge" with missing bits and pieces.
One of the "common knowledge" items is that immediately after you merge a post-branchout patch to master, you should tag it (with v4.40).
Yes, https://gerrit.ovirt.org/97841 would be a good patch to start new master with.

Nir Soffer <nsoffer@redhat.com> writes:
On Tue, Feb 26, 2019 at 1:37 PM Milan Zamazal <mzamazal@redhat.com> wrote:
Dan Kenigsberg <danken@redhat.com> writes:
On Tue, Feb 26, 2019 at 1:24 PM Milan Zamazal <mzamazal@redhat.com> wrote:
Hi,
I created ovirt-4.3 branch. That means patches for 4.3 must be backported from master since now.
Not everything regarding CI is ready yet, but until we make the branch, we can't make some things working nor prove they are working. We need the branch to move forward.
*Please don't merge non-4.3 patches to master yet.*
Do we plan to rebase on master after initial testing?
No. I'm going to merge 4.3 backports quickly during the testing phase and to make the testing phase as short as possible.
Let's make 4.3 backports completely safe and trivial for a while, until we have working CI on 4.3.
I'm not particularly happy with the branching process, let's use this experience to improve it next time. At minimum some guidelines should exist rather than just "common knowledge" with missing bits and pieces.
One of the "common knowledge" items is that immediately after you merge a post-branchout patch to master, you should tag it (with v4.40).
Yes, https://gerrit.ovirt.org/97841 would be a good patch to start new master with.

On Tue, Feb 26, 2019 at 1:47 PM Milan Zamazal <mzamazal@redhat.com> wrote:
Nir Soffer <nsoffer@redhat.com> writes:
On Tue, Feb 26, 2019 at 1:37 PM Milan Zamazal <mzamazal@redhat.com> wrote:
Dan Kenigsberg <danken@redhat.com> writes:
On Tue, Feb 26, 2019 at 1:24 PM Milan Zamazal <mzamazal@redhat.com> wrote:
Hi,
I created ovirt-4.3 branch. That means patches for 4.3 must be backported from master since now.
Not everything regarding CI is ready yet, but until we make the branch, we can't make some things working nor prove they are working. We need the branch to move forward.
*Please don't merge non-4.3 patches to master yet.*
Do we plan to rebase on master after initial testing?
No. I'm going to merge 4.3 backports quickly during the testing phase and to make the testing phase as short as possible.
Ok, sounds good.
Let's make 4.3 backports completely safe and trivial for a while, until we have working CI on 4.3.
I'm not particularly happy with the branching process, let's use this experience to improve it next time. At minimum some guidelines should exist rather than just "common knowledge" with missing bits and pieces.
One of the "common knowledge" items is that immediately after you merge a post-branchout patch to master, you should tag it (with v4.40).
Yes, https://gerrit.ovirt.org/97841 would be a good patch to start new master with.

On Tue, Feb 26, 2019 at 1:19 PM Nir Soffer <nsoffer@redhat.com> wrote:
On Tue, Feb 26, 2019 at 1:47 PM Milan Zamazal <mzamazal@redhat.com> wrote:
Nir Soffer <nsoffer@redhat.com> writes:
On Tue, Feb 26, 2019 at 1:37 PM Milan Zamazal <mzamazal@redhat.com> wrote:
Dan Kenigsberg <danken@redhat.com> writes:
On Tue, Feb 26, 2019 at 1:24 PM Milan Zamazal <mzamazal@redhat.com> wrote:
Hi,
I created ovirt-4.3 branch. That means patches for 4.3 must be backported from master since now.
Great work Milan! Please also merge https://gerrit.ovirt.org/96632 asap so we ca proceed with engine branching and introducing 4.4 Thanks M
Not everything regarding CI is ready yet, but until we make the
branch,
we can't make some things working nor prove they are working. We need the branch to move forward.
*Please don't merge non-4.3 patches to master yet.*
Do we plan to rebase on master after initial testing?
No. I'm going to merge 4.3 backports quickly during the testing phase and to make the testing phase as short as possible.
Ok, sounds good.
Let's make 4.3 backports completely safe and trivial for a while, until we have working CI on 4.3.
I'm not particularly happy with the branching process, let's use this experience to improve it next time. At minimum some guidelines should exist rather than just "common knowledge" with missing bits and pieces.
One of the "common knowledge" items is that immediately after you merge a post-branchout patch to master, you should tag it (with v4.40).
Yes, https://gerrit.ovirt.org/97841 would be a good patch to start new master with.
_______________________________________________ Devel mailing list -- devel@ovirt.org To unsubscribe send an email to devel-leave@ovirt.org Privacy Statement: https://www.ovirt.org/site/privacy-policy/ oVirt Code of Conduct: https://www.ovirt.org/community/about/community-guidelines/ List Archives: https://lists.ovirt.org/archives/list/devel@ovirt.org/message/MRITHOMO46LFLO...
-- Martin Perina Associate Manager, Software Engineering Red Hat Czech s.r.o.

On Tue, Feb 26, 2019 at 1:47 PM Milan Zamazal <mzamazal@redhat.com> wrote:
Nir Soffer <nsoffer@redhat.com> writes:
On Tue, Feb 26, 2019 at 1:37 PM Milan Zamazal <mzamazal@redhat.com> wrote:
Dan Kenigsberg <danken@redhat.com> writes:
On Tue, Feb 26, 2019 at 1:24 PM Milan Zamazal <mzamazal@redhat.com> wrote:
Hi,
I created ovirt-4.3 branch. That means patches for 4.3 must be backported from master since now.
Not everything regarding CI is ready yet, but until we make the branch, we can't make some things working nor prove they are working. We need the branch to move forward.
*Please don't merge non-4.3 patches to master yet.*
Do we plan to rebase on master after initial testing?
No. I'm going to merge 4.3 backports quickly during the testing phase and to make the testing phase as short as possible.
So we have these backports for 4.3: https://gerrit.ovirt.org/q/topic:backport%252F4.3%252F4k Waiting for your quick merge :-) Denis, Vojta, please use same topic when you post 4k backports so we have an easy way to track pending patches. Nir

Nir Soffer <nsoffer@redhat.com> writes:
On Tue, Feb 26, 2019 at 1:47 PM Milan Zamazal <mzamazal@redhat.com> wrote:
Nir Soffer <nsoffer@redhat.com> writes:
On Tue, Feb 26, 2019 at 1:37 PM Milan Zamazal <mzamazal@redhat.com> wrote:
Dan Kenigsberg <danken@redhat.com> writes:
On Tue, Feb 26, 2019 at 1:24 PM Milan Zamazal <mzamazal@redhat.com> wrote:
Hi,
I created ovirt-4.3 branch. That means patches for 4.3 must be backported from master since now.
Not everything regarding CI is ready yet, but until we make the branch, we can't make some things working nor prove they are working. We need the branch to move forward.
*Please don't merge non-4.3 patches to master yet.*
Do we plan to rebase on master after initial testing?
No. I'm going to merge 4.3 backports quickly during the testing phase and to make the testing phase as short as possible.
So we have these backports for 4.3: https://gerrit.ovirt.org/q/topic:backport%252F4.3%252F4k
Waiting for your quick merge :-)
Done. If you can, please check what CI has done with your ovirt-4.3 patches. If it works as expected, we can drop the embargo on master and start handling backports in usual ways. If anything is wrong or missing, please report. Just note that the only OST 4.3 suite already merged is basic-suite-4.3. We've been working with Galit and others on porting other suites, but it may take a couple of days before it is finished.
Denis, Vojta, please use same topic when you post 4k backports so we have an easy way to track pending patches.
Nir

On Tue, Feb 26, 2019 at 11:59 PM Milan Zamazal <mzamazal@redhat.com> wrote:
Nir Soffer <nsoffer@redhat.com> writes:
On Tue, Feb 26, 2019 at 1:47 PM Milan Zamazal <mzamazal@redhat.com> wrote:
Nir Soffer <nsoffer@redhat.com> writes:
On Tue, Feb 26, 2019 at 1:37 PM Milan Zamazal <mzamazal@redhat.com> wrote:
Dan Kenigsberg <danken@redhat.com> writes:
On Tue, Feb 26, 2019 at 1:24 PM Milan Zamazal <mzamazal@redhat.com
wrote:
> Hi, > > I created ovirt-4.3 branch. That means patches for 4.3 must be > backported from master since now. > > Not everything regarding CI is ready yet, but until we make the
branch,
> we can't make some things working nor prove they are working. We need > the branch to move forward. > > *Please don't merge non-4.3 patches to master yet.*
Do we plan to rebase on master after initial testing?
No. I'm going to merge 4.3 backports quickly during the testing phase and to make the testing phase as short as possible.
So we have these backports for 4.3: https://gerrit.ovirt.org/q/topic:backport%252F4.3%252F4k
Waiting for your quick merge :-)
Done.
If you can, please check what CI has done with your ovirt-4.3 patches.
So far only one patch finished the on merge job: https://jenkins.ovirt.org/job/vdsm_standard-on-merge/381/ For the other 2 patches, no build was started: https://gerrit.ovirt.org/c/98068 https://gerrit.ovirt.org/c/98066 I see 2 pending jobs here: https://jenkins.ovirt.org/job/vdsm_standard-on-merge/ #385, #386 Maybe we don't have enough resources for running the 4.3 jobs?
If it works as expected, we can drop the embargo on master and start handling backports in usual ways. If anything is wrong or missing, please report.
Just note that the only OST 4.3 suite already merged is basic-suite-4.3.
Cool, we will try it with 4.3 branch. Nir

On Wed, Feb 27, 2019 at 12:25 AM Nir Soffer <nsoffer@redhat.com> wrote:
On Tue, Feb 26, 2019 at 11:59 PM Milan Zamazal <mzamazal@redhat.com> wrote:
Nir Soffer <nsoffer@redhat.com> writes:
On Tue, Feb 26, 2019 at 1:47 PM Milan Zamazal <mzamazal@redhat.com> wrote:
Nir Soffer <nsoffer@redhat.com> writes:
On Tue, Feb 26, 2019 at 1:37 PM Milan Zamazal <mzamazal@redhat.com> wrote:
Dan Kenigsberg <danken@redhat.com> writes:
> On Tue, Feb 26, 2019 at 1:24 PM Milan Zamazal < mzamazal@redhat.com> wrote: > >> Hi, >> >> I created ovirt-4.3 branch. That means patches for 4.3 must be >> backported from master since now. >> >> Not everything regarding CI is ready yet, but until we make the branch, >> we can't make some things working nor prove they are working. We need >> the branch to move forward. >> >> *Please don't merge non-4.3 patches to master yet.*
Do we plan to rebase on master after initial testing?
No. I'm going to merge 4.3 backports quickly during the testing phase and to make the testing phase as short as possible.
So we have these backports for 4.3: https://gerrit.ovirt.org/q/topic:backport%252F4.3%252F4k
Waiting for your quick merge :-)
Done.
If you can, please check what CI has done with your ovirt-4.3 patches.
So far only one patch finished the on merge job: https://jenkins.ovirt.org/job/vdsm_standard-on-merge/381/
For the other 2 patches, no build was started: https://gerrit.ovirt.org/c/98068 https://gerrit.ovirt.org/c/98066
I see 2 pending jobs here: https://jenkins.ovirt.org/job/vdsm_standard-on-merge/ #385, #386
Maybe we don't have enough resources for running the 4.3 jobs?
If it works as expected, we can drop the embargo on master and start handling backports in usual ways. If anything is wrong or missing, please report.
Just note that the only OST 4.3 suite already merged is basic-suite-4.3.
Cool, we will try it with 4.3 branch.
Nir _______________________________________________ Devel mailing list -- devel@ovirt.org To unsubscribe send an email to devel-leave@ovirt.org Privacy Statement: https://www.ovirt.org/site/privacy-policy/ oVirt Code of Conduct: https://www.ovirt.org/community/about/community-guidelines/ List Archives: https://lists.ovirt.org/archives/list/devel@ovirt.org/message/ZJWRANU6DCQPDL...
-- Eyal edri MANAGER RHV/CNV 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)

Milan Zamazal <mzamazal@redhat.com> writes:
*Please don't merge non-4.3 patches to master yet.* Let's make 4.3 backports completely safe and trivial for a while, until we have working CI on 4.3.
It seems CI runs what's expected on ovirt-4.3 branch, so I think we can start merging patches to master normally and start using standard backporting procedures for 4.3. One minor glitch is that vdsm/automation for Fedora still points to master oVirt repos in ovirt-4.3 branch due to missing contents in 4.3 oVirt repos. It shouldn't be a big problem now and it should be updated once 4.3 repos settle down.
participants (5)
-
Dan Kenigsberg
-
Eyal Edri
-
Martin Perina
-
Milan Zamazal
-
Nir Soffer