On Tue, Feb 26, 2019 at 1:24 PM Milan Zamazal <mzamazal(a)redhat.com&gt; 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).

On Tue, Feb 26, 2019 at 1:37 PM Milan Zamazal <mzamazal(a)redhat.com&gt; wrote: > Dan Kenigsberg <danken(a)redhat.com&gt; writes: > > > On Tue, Feb 26, 2019 at 1:24 PM Milan Zamazal <mzamazal(a)redhat.com&gt; > 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?

On Tue, Feb 26, 2019 at 1:47 PM Milan Zamazal <mzamazal(a)redhat.com&gt; wrote: > Nir Soffer <nsoffer(a)redhat.com&gt; writes: > > > On Tue, Feb 26, 2019 at 1:37 PM Milan Zamazal <mzamazal(a)redhat.com&gt; > wrote: > > > >> Dan Kenigsberg <danken(a)redhat.com&gt; writes: > >> > >> > On Tue, Feb 26, 2019 at 1:24 PM Milan Zamazal <mzamazal(a)redhat.com&gt; > >> 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. > >> > _______________________________________________ Devel mailing list -- devel(a)ovirt.org To unsubscribe send an email to devel-leave(a)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/MRITHOMO46L...

On Tue, Feb 26, 2019 at 1:47 PM Milan Zamazal <mzamazal(a)redhat.com&gt; wrote: > Nir Soffer <nsoffer(a)redhat.com&gt; writes: > > > On Tue, Feb 26, 2019 at 1:37 PM Milan Zamazal <mzamazal(a)redhat.com&gt; > wrote: > > > >> Dan Kenigsberg <danken(a)redhat.com&gt; writes: > >> > >> > On Tue, Feb 26, 2019 at 1:24 PM Milan Zamazal <mzamazal(a)redhat.com&gt; > >> 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 :-)

On Tue, Feb 26, 2019 at 11:59 PM Milan Zamazal <mzamazal(a)redhat.com&gt; wrote: > Nir Soffer <nsoffer(a)redhat.com&gt; writes: > > > On Tue, Feb 26, 2019 at 1:47 PM Milan Zamazal <mzamazal(a)redhat.com&gt; > wrote: > > > >> Nir Soffer <nsoffer(a)redhat.com&gt; writes: > >> > >> > On Tue, Feb 26, 2019 at 1:37 PM Milan Zamazal <mzamazal(a)redhat.com&gt; > >> wrote: > >> > > >> >> Dan Kenigsberg <danken(a)redhat.com&gt; writes: > >> >> > >> >> > On Tue, Feb 26, 2019 at 1:24 PM Milan Zamazal < > mzamazal(a)redhat.com&gt; > >> >> 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(a)ovirt.org To unsubscribe send an email to devel-leave(a)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/ZJWRANU6DCQ...