[yast-devel] Branches for Leap
First day after Leap release, first day after branching SP1... first doubt. We have assumed that the "Leap team" will take care of making sure that our fixes for SP1 end in 42.1 as well. In that perfect world we only commit to two branches on the repo (master and SLE-12-SP1). We submit stuff from master to Factory and SP2:GA and stuff from SLE-12-SP1 to SP1:GA or SP1:Update. But there are corner cases, sometimes we need to fix something that only affects Leap. The most obvious example is a YaST package that is only in openSUSE but not in SLE (not 100% of the YaST Leap packages come from SLE). Like this bug. https://bugzilla.suse.com/show_bug.cgi?id=952249 To me, it looks like we also need an openSUSE-42_1 branch in the yast-control-center repo and maybe in some others. We can create them on demand, since there is no automation involved and we probably need to check from which commit branch in a case by case basis. I hope packages coming from TW to be the only corner case for Leap. For bugs in the SLE-12-SP1 branch that only affects Leap I hope the SLE (maintenance) staff will allow us to commit the fixes there and release maintenance updates as long as we don't break SLE in the process, even if they don't fix any real SLE issue. Cheers. -- Ancor González Sosa YaST Team at SUSE Linux GmbH -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org
Dne 5.11.2015 v 08:36 Ancor Gonzalez Sosa napsal(a):
First day after Leap release, first day after branching SP1... first doubt.
We have assumed that the "Leap team" will take care of making sure that our fixes for SP1 end in 42.1 as well. In that perfect world we only commit to two branches on the repo (master and SLE-12-SP1). We submit stuff from master to Factory and SP2:GA and stuff from SLE-12-SP1 to SP1:GA or SP1:Update.
But there are corner cases, sometimes we need to fix something that only affects Leap. The most obvious example is a YaST package that is only in openSUSE but not in SLE (not 100% of the YaST Leap packages come from SLE). Like this bug. https://bugzilla.suse.com/show_bug.cgi?id=952249
Just nitpicking: this is a wrong example, yast2-control-center-qt actually *is* in SLE12: # zypper se -s yast2-control-center-qt Refreshing service 'SUSE_Linux_Enterprise_Server_12_SP1_x86_64'. Loading repository data... Reading installed packages... S | Name | Type | Version | Arch | Repository --+-------------------------+---------+------------+--------+------------------ | yast2-control-center-qt | package | 3.1.3-1.15 | x86_64 | SLES12-SP1-Pool | yast2-control-center-qt | package | 3.1.3-1.15 | x86_64 | SLES12-SP1-12.1-0 It's just not installed by default (yast2-control-center-gnome is). The correct example would be yast2-fonts package. Is there any other openSUSE only package?
To me, it looks like we also need an openSUSE-42_1 branch in the yast-control-center repo and maybe in some others. We can create them on demand, since there is no automation involved and we probably need to check from which commit branch in a case by case basis.
Agreed.
I hope packages coming from TW to be the only corner case for Leap. For bugs in the SLE-12-SP1 branch that only affects Leap I hope the SLE (maintenance) staff will allow us to commit the fixes there and release maintenance updates as long as we don't break SLE in the process, even if they don't fix any real SLE issue.
To simplify the process we should put the Leap fixes also to SLE and release them when a real SLE bug fix is needed. It won't harm SLE, but will make it much easier for us... -- Best Regards Ladislav Slezák Yast Developer ------------------------------------------------------------------------ SUSE LINUX, s.r.o. e-mail: lslezak@suse.cz Lihovarská 1060/12 tel: +420 284 028 960 190 00 Prague 9 fax: +420 284 028 951 Czech Republic http://www.suse.cz/ -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org
On Thu, 5 Nov 2015 08:36:53 +0100
Ancor Gonzalez Sosa
First day after Leap release, first day after branching SP1... first doubt.
We have assumed that the "Leap team" will take care of making sure that our fixes for SP1 end in 42.1 as well. In that perfect world we only commit to two branches on the repo (master and SLE-12-SP1). We submit stuff from master to Factory and SP2:GA and stuff from SLE-12-SP1 to SP1:GA or SP1:Update.
But there are corner cases, sometimes we need to fix something that only affects Leap. The most obvious example is a YaST package that is only in openSUSE but not in SLE (not 100% of the YaST Leap packages come from SLE). Like this bug. https://bugzilla.suse.com/show_bug.cgi?id=952249
To me, it looks like we also need an openSUSE-42_1 branch in the yast-control-center repo and maybe in some others. We can create them on demand, since there is no automation involved and we probably need to check from which commit branch in a case by case basis.
I hope packages coming from TW to be the only corner case for Leap. For bugs in the SLE-12-SP1 branch that only affects Leap I hope the SLE (maintenance) staff will allow us to commit the fixes there and release maintenance updates as long as we don't break SLE in the process, even if they don't fix any real SLE issue.
Cheers.
I thought that conclusion is to use leap branch only when neeeded. There is more packages needed it like skelcd-control-opensuse or maybe theme. So if we need to diverge, create branch, if not, then use only SLE12-SP1 branch. Maybe I should document it in https://yastgithubio.readthedocs.org/en/latest/maintenance-branches/#mainten... Josef -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org
participants (3)
-
Ancor Gonzalez Sosa -
Josef Reidinger -
Ladislav Slezak