On 08/12/2015 01:06 PM, Ladislav Slezak wrote:

Dne 11.8.2015 v 16:17 Stefan Hundhammer napsal(a):

...

Am 11.08.2015 um 13:40 schrieb Ancor Gonzalez Sosa:

...

To address https://fate.suse.com/318426 it will be soon necessary to branch Factory and SLE12-SP1 at least for yast-x11 and yast-country, since we want to introduce the new systemd-compliant system in Factory as soon as possible (other components of the solution have submit requests already).

So time for the usual questions when branching: global change in all modules vs only the two affected, changes needed in Jenkins to prevent submission to SP1, etc.

Please let's branch only the packages that really need it so we can minimize the hassle and possible user errors for everything else.

Yes, branch just the two packages, it does not make much sense to do global branching just because of two packages (more over these two are not touched often).

I'd suggest to add some kind of "warning" into the main README.md so it's obvious that the "master" is for Factory only and that there is a separate SP1 branch.

We need to adjust the Jenkins setup first for the affected packages (before doing any change in "master") to avoid submitting the changes to SP1...

And who can/will do it? :-) 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

On 08/18/2015 08:57 AM, Josef Reidinger wrote:

On Mon, 17 Aug 2015 17:07:46 +0200 Ancor Gonzalez Sosa wrote:

...

On 08/12/2015 01:06 PM, Ladislav Slezak wrote:

...

Dne 11.8.2015 v 16:17 Stefan Hundhammer napsal(a):

...

Am 11.08.2015 um 13:40 schrieb Ancor Gonzalez Sosa:

...

To address https://fate.suse.com/318426 it will be soon necessary to branch Factory and SLE12-SP1 at least for yast-x11 and yast-country, since we want to introduce the new systemd-compliant system in Factory as soon as possible (other components of the solution have submit requests already).

So time for the usual questions when branching: global change in all modules vs only the two affected, changes needed in Jenkins to prevent submission to SP1, etc.

Please let's branch only the packages that really need it so we can minimize the hassle and possible user errors for everything else.

Yes, branch just the two packages, it does not make much sense to do global branching just because of two packages (more over these two are not touched often).

I'd suggest to add some kind of "warning" into the main README.md so it's obvious that the "master" is for Factory only and that there is a separate SP1 branch.

We need to adjust the Jenkins setup first for the affected packages (before doing any change in "master") to avoid submitting the changes to SP1...

And who can/will do it? :-)

Cheers.

I can do it on jenkins side. In general what is needed:

1) modify jenkins ( river to point to new branch for given packages ) 2a) create SP1 branch 2b) modify in SP1 branch Rakefile to use correct defaults targets

And it should be everything needed. To make your life even easier, I create in past script that do 2 even easier - https://github.com/yast/yast-devtools/blob/master/ytools/yast2/create_mainte... just modify constant on top of file to fit and then run it in git clone root

Step 2 (a+b) already done thanks to create_maintenance_branch. Feel free to review the resulting Rakefile and proceed to modify river. So guys, take into account that from now on (well, after modifying river) stuff committed to master of yast-keyboard will NOT go to SP1. 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

On Fri, 21 Aug 2015 14:36:15 +0100 Imobach González Sosa wrote:

On Tuesday, August 18, 2015 08:57:16 AM Josef Reidinger wrote:

Hi,

...

I can do it on jenkins side. In general what is needed:

1) modify jenkins ( river to point to new branch for given packages ) 2a) create SP1 branch 2b) modify in SP1 branch Rakefile to use correct defaults targets

And it should be everything needed. To make your life even easier, I create in past script that do 2 even easier - https://github.com/yast/yast-devtools/blob/master/ytools/yast2/create_mainte nance_branch just modify constant on top of file to fit and then run it in git clone root

Frankly, I lost easily with IBS/OBS but I guess that maybe we could get into troubles here.

Although we have a different branch for those packages, they're submitted to Devel:YaST:Head on IBS. Or do we have a different project for them?

currently in Head, as we do not submit master anywhere, but when more packages start using it, we use Devel:YaST:SLE-12-SP1 same as we have Devel:YaST:SLE-12 for GA maintenance packages. https://build.suse.de/project/show/Devel:YaST:SLE-12 so when we start SP2 developement it again use head Josef -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org