On Thu, Aug 28, 2014 at 09:58:40AM +0200, Lukas Ocilka wrote:

...

...

- Should we create the branches globally or should we leave that on the respective maintainers?

globally. To guarantee that all repos are in same "shape"

How I see it, we should make sure that such a branch contains everything that made it to SLE 12, but nothing more. I've seen in the past, that branch did not contain everything or contained more commits than got to a particular product.

Do you have examples of mismatches, to remind us of the pitfalls to avoid? So far I interpret this as "remember to submit from the right branch" which Jenkins should automate just fine. A stronger requirement is "distinguish SLE12-GA from maintenance", which would be implemented by tags. Automatict tagging is not working now. -- Martin Vidner, Cloud & Systems Management Team http://en.opensuse.org/User:Mvidner Kuracke oddeleni v restauraci je jako fekalni oddeleni v bazenu

On Tue, Sep 02, 2014 at 11:09:15AM +0200, Lukas Ocilka wrote:

PLS, also remember that I'd like to branch SLE12-SP1 maintenance from "master" to keep the development of master/openSUSE/SLE12-SP1 as close as possible - as long as possible.

Do I understand this right: You want to base YaST on SLE12 SP1 on "master in about a year" instead of SLE12? Regards, Arvin -- Arvin Schnell, Senior Software Engineer, Research & Development SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Maxfeldstraße 5 90409 Nürnberg Germany -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org

On Tue, Sep 02, 2014 at 11:24:41AM +0200, Lukas Ocilka wrote:

On 2.9.2014 11:20, Arvin Schnell wrote:

...

On Tue, Sep 02, 2014 at 11:09:15AM +0200, Lukas Ocilka wrote:

...

PLS, also remember that I'd like to branch SLE12-SP1 maintenance from "master" to keep the development of master/openSUSE/SLE12-SP1 as close as possible - as long as possible.

Do I understand this right: You want to base YaST on SLE12 SP1 on "master in about a year" instead of SLE12?

Yes, I already wrote about it a few ... hmm, months ago. There will be a lot of refactoring in master, but we are going to maintain SLE 12 for many years, so the same refactoring should go to SLE 12 SP1.

In fact, there are plans for having SLE and openSUSE much closer than before. More to be announced soon, hopefully.

An announcement is a requirement since your proposal does not match the current maintenance model. Regards, Arvin -- Arvin Schnell, Senior Software Engineer, Research & Development SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Maxfeldstraße 5 90409 Nürnberg Germany -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org

On Tue, Sep 02, 2014 at 12:44:08PM +0200, Ladislav Slezak wrote:

Dne 2.9.2014 10:47, Martin Vidner napsal(a): [...]

...

Do you have examples of mismatches, to remind us of the pitfalls to avoid? So far I interpret this as "remember to submit from the right branch" which Jenkins should automate just fine.

The problem is that just before the GM release the build service team might reject a submit request. Then you have a different state in GIT/Devel:YaST:Head/Jenkins and the final product.

So at the last minute we should fix only the bugs confirmed by PMs or release managers to avoid this and we should watch for "rejected" SRs and either fix them and resubmit or revert in GIT to be consistent.

Or the build service team should be included in the GitHub review process. That reminds me of a problem I have with SLE11 SP development: Sometimes a patch/package is requested for e.g. SP3 but then the package is simply copied to SP2. Thus the branches in the repository and the build service state get completely messed up. Regards, Arvin -- Arvin Schnell, Senior Software Engineer, Research & Development SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Maxfeldstraße 5 90409 Nürnberg Germany -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org

On Tue, 2 Sep 2014 10:46:05 +0200 Martin Vidner wrote:

On Thu, Aug 28, 2014 at 08:53:49AM +0200, Ladislav Slezak wrote:

...

I'd like to start a discussion about creating the SLE12 branch in Git repositories.

The basic questions are:

- When should we create the branch? Do you need it already now?

Michal, Lada, and Lukas don't need it.

Pepa mentioned yast2-core, but more importantly yast2-bootloader: openSUSE has a freeze before the SLE release!

...

- Should we create the branches globally or should we leave that on the respective maintainers?

It's not that simple. I think that waiting for a global switch is not possible because of openSUSE requirements, and leaving switches to individuals means we end up with a mess.

I think reasonable solution is to create script to do such switch on individual branch and who need it can use it and who do not, then can wait for global, that run it on everything. Is this reasonable solution?

Current policy, for all packages:

The internal Jenkins submits master to SLE12, for all packages.

Unless it is explicitelly overwritten in Rakefile, which is what I plan to do in given branches.

We should pick one or a couple of packages as pilots for the new policy:

The internal Jenkins submits $BRANCH to SLE12, and does not care(?) about master".

It is quite simple switch on which branch jenkins operate, nothing more. Ideally it copy previous task and just change branch tag.

Then announce which packages are in the pilot, implement that, fix bugs. Later, clearly communicate when other individual packages adopt the policy as needed, and when all the rest do (SLE release).

agree.

What will the branch name be? I propose Code-12.

I do not agree, as it is in fact not base for Code-12 as Lukas mentioned above. It is just branch for maintenance of SLE-12-GA, so not whole Code-12...so I propose SLE-12-GA branch name. Josef -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org

On Thu, 4 Sep 2014 08:45:27 +0200 Josef Reidinger wrote:

On Tue, 2 Sep 2014 10:46:05 +0200 Martin Vidner wrote:

...

On Thu, Aug 28, 2014 at 08:53:49AM +0200, Ladislav Slezak wrote:

...

I'd like to start a discussion about creating the SLE12 branch in Git repositories.

The basic questions are:

- When should we create the branch? Do you need it already now?

Michal, Lada, and Lukas don't need it.

Pepa mentioned yast2-core, but more importantly yast2-bootloader: openSUSE has a freeze before the SLE release!

So just reminder, now is time when I need it as I finish my grub1 drop and want to continue with other improvements in bootlaoder code like switch from automake to rake tasks, improved test suite and refactoring of some really ugly methods which is used. https://github.com/yast/yast-bootloader/pull/149

So if noone have against, I can create script that do all stuff for SLE-12-GA maintenance branch + create task on internal jenkins.

Josef

I create such script and already test it on yast2-bootloader. You can find it in devtools - https://github.com/yast/yast-devtools/blob/master/ytools/yast2/create_mainte... I try to follow KISS so configuration is inside and code is I hope readable. Welcome any comments Josef