[yast-devel] Git Branches for openSUSE 13.2
Hi, As I said in the team call, I want to avoid uncertainty and inconsistencies, so please let's come to an agreement about Git branches for openSUSE 13.2. Branch Name ----------- openSUSE-13_2 This is the only clear thing :) Global or Individual -------------------- Do we want to make the branches globally in all repos at once, or leave it to the individual maintainers? I think that depends on how we want Jenkins and Travis to work, which I don't know, see below. Jenkins ------- Recall that for SLE 12 in IBS we have - Devel:YaST:Head - Devel:YaST:SLE-12 But in OBS we have always had just YaST:Head, with no dedicated maintenance project. OTOH the Jenkins jobs for Devel:YaST:SLE-12 are failing anyway (all of them except 2) so how is this supposed to work?? Travis ------ With the current setup, Travis will build PRs to the openSUSE-13_2 branch with dependencies from master which is wrong, giving false positives and false negatives. -- Martin Vidner, Cloud & Systems Management Team http://en.opensuse.org/User:Mvidner Kuracke oddeleni v restauraci je jako fekalni oddeleni v bazenu
On Wed, 5 Nov 2014 11:06:52 +0100 Martin Vidner <mvidner@suse.cz> wrote:
Hi,
As I said in the team call, I want to avoid uncertainty and inconsistencies, so please let's come to an agreement about Git branches for openSUSE 13.2.
Branch Name -----------
openSUSE-13_2
This is the only clear thing :)
Global or Individual --------------------
Do we want to make the branches globally in all repos at once, or leave it to the individual maintainers? I think that depends on how we want Jenkins and Travis to work, which I don't know, see below.
For me it mostly depends how big load we expect, for some modules I do not expect big load, so time spend on adaptation is waste as won't be used at all.
Jenkins -------
Recall that for SLE 12 in IBS we have
- Devel:YaST:Head - Devel:YaST:SLE-12
But in OBS we have always had just YaST:Head, with no dedicated maintenance project.
OTOH the Jenkins jobs for Devel:YaST:SLE-12 are failing anyway (all of them except 2) so how is this supposed to work??
It will work when GM will be released and I switch to correct bs branch and install new osc that can handle this situation.
Travis ------
With the current setup, Travis will build PRs to the openSUSE-13_2 branch with dependencies from master which is wrong, giving false positives and false negatives.
I think it should be driven by travis_yml, so maybe we just need to modify travis_yml to take packages from maintenance branch? As I said for decision I think we need to see how much such branch will be used. We can e.g. try to check how often we update branch for 13.1? Josef
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Dne 5.11.2014 v 11:22 Josef Reidinger napsal(a): [...]
Travis ------
With the current setup, Travis will build PRs to the openSUSE-13_2 branch with dependencies from master which is wrong, giving false positives and false negatives.
I think it should be driven by travis_yml, so maybe we just need to modify travis_yml to take packages from maintenance branch?
Yes, but there is no maintenance branch in OBS. I mean, Travis uses packages from YaST:Head:Travis which links to YaST:Head (Git master). So we can - - disable Travis support - simply remove .travis.yml files from the branch, Travis is currently configured to build only branches with the .travis.yml file. - - add Travis support for the maintenance branch: - add YaST:openSUSE_13.2 (or something like that) project and submit the packages from the maintenance branch there (ideally via a Jenkins job) - create YaST:openSUSE_13.2:Travis project, link the packages to YaST:openSUSE_13.2 and add Debian/Ubuntu builds. - update the Travis script to download the packages from YaST:openSUSE_13.2:Travis We could apply the same for the SLE12 branch and enable Travis builds also for SLE12 maintenance updates. That would actually make sense, given the length of the support... (BTW SLE12 target has been already added to OBS...) The first solution is trivial, but apparently not the right way (IMHO) we should go. Josef, would it be possible to adapt Jenkins to handle the maintenance branch in OBS (addin new jobs)? How much work would it need? - -- Ladislav Slezák Appliance department / YaST Developer Lihovarská 1060/12 190 00 Prague 9 / Czech Republic tel: +420 284 028 960 lslezak@suse.com SUSE -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQEcBAEBAgAGBQJUWk4+AAoJEHHp6jkF1zbPgK8H/RJqj/yqV3eHbd708om2+Pgm LR7nqeAwGAeEb36iEDhnhGWnZF0oFTfstmUXUV1ZxGNKkLYWJfGVo6+lb6bjlLyH 5fEWK0h8SmvCb0WnN9rMihXhcEWBmY972eT147oP6DmPIHu7Rs+YSw7yceJsXBAM M58/MhtdoGmr5oLxbVkjVkAJtIjQ6CQ7R1X7df9tIi1j97LZwb7TTdzANgfmsrm3 kEYOhXvXuIAnJB3UD+d1/7Uaw5rQYa60HbIqxI1rjKTejXYeb96iwie1+81CzkTE ZY+Ox3AmWz3HhrAIqy1vRlIw7d+bwUB+96tgrE9hjqiAVm+ZSA0S8Rdj4NPGLng= =2EgO -----END PGP SIGNATURE----- -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org
On Wed, 05 Nov 2014 17:20:14 +0100 Ladislav Slezak <lslezak@suse.cz> wrote:
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
Dne 5.11.2014 v 11:22 Josef Reidinger napsal(a): [...]
Travis ------
With the current setup, Travis will build PRs to the openSUSE-13_2 branch with dependencies from master which is wrong, giving false positives and false negatives.
I think it should be driven by travis_yml, so maybe we just need to modify travis_yml to take packages from maintenance branch?
Yes, but there is no maintenance branch in OBS. I mean, Travis uses packages from YaST:Head:Travis which links to YaST:Head (Git master).
So we can
- - disable Travis support - simply remove .travis.yml files from the branch, Travis is currently configured to build only branches with the .travis.yml file.
- - add Travis support for the maintenance branch: - add YaST:openSUSE_13.2 (or something like that) project and submit the packages from the maintenance branch there (ideally via a Jenkins job) - create YaST:openSUSE_13.2:Travis project, link the packages to YaST:openSUSE_13.2 and add Debian/Ubuntu builds. - update the Travis script to download the packages from YaST:openSUSE_13.2:Travis
We could apply the same for the SLE12 branch and enable Travis builds also for SLE12 maintenance updates. That would actually make sense, given the length of the support... (BTW SLE12 target has been already added to OBS...)
The first solution is trivial, but apparently not the right way (IMHO) we should go.
Josef, would it be possible to adapt Jenkins to handle the maintenance branch in OBS (addin new jobs)? How much work would it need?
It is possible. It is not so much work, but it require some maintenance if there are problems ( and almost always problems appear :). Josef
- --
Ladislav Slezák Appliance department / YaST Developer Lihovarská 1060/12 190 00 Prague 9 / Czech Republic tel: +420 284 028 960 lslezak@suse.com SUSE -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux)
iQEcBAEBAgAGBQJUWk4+AAoJEHHp6jkF1zbPgK8H/RJqj/yqV3eHbd708om2+Pgm LR7nqeAwGAeEb36iEDhnhGWnZF0oFTfstmUXUV1ZxGNKkLYWJfGVo6+lb6bjlLyH 5fEWK0h8SmvCb0WnN9rMihXhcEWBmY972eT147oP6DmPIHu7Rs+YSw7yceJsXBAM M58/MhtdoGmr5oLxbVkjVkAJtIjQ6CQ7R1X7df9tIi1j97LZwb7TTdzANgfmsrm3 kEYOhXvXuIAnJB3UD+d1/7Uaw5rQYa60HbIqxI1rjKTejXYeb96iwie1+81CzkTE ZY+Ox3AmWz3HhrAIqy1vRlIw7d+bwUB+96tgrE9hjqiAVm+ZSA0S8Rdj4NPGLng= =2EgO -----END PGP SIGNATURE-----
-- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org
On 5.11.2014 11:22, Josef Reidinger wrote:
Branch Name ----------- openSUSE-13_2
Yes
Global or Individual --------------------
Global - we don't need to use it, but everyone will have the branch ready when needed and it will always have the correct name and developers will not push to master when they actually wanted to push to the maintenance branch. Been there, seen it before.
Jenkins -------
&& OBS Devel:YaST:openSUSE_13.2 (or similar) This is connected to the globally created branch and auto-submission. We will find out it was a good decision when 13.2 starts to diverge from master. Yast:Head is for future development, refactoring, breaking stuff, living at the edge. Yast:Head is NOT for maintenance.
Travis ------
Connected to globally created branch and project maintenance branch. If we want to use the power of Travis, must now show false positive/negative failures/successes, thus it has to use the correct source of code and tests. Bye Lukas -- Lukas Ocilka, Systems Management (Yast) Team Leader Cloud & Systems Management Department, SUSE Linux -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org
Dne 24.11.2014 v 10:57 Lukas Ocilka napsal(a):
On 5.11.2014 11:22, Josef Reidinger wrote:
Jenkins -------
&& OBS
Devel:YaST:openSUSE_13.2 (or similar)
Looks OK, I have already created Devel:YaST:SLE-12:GA for SLE12 (Devel:YaST:SLE-12:SP1 should follow later...).
Travis ------
Connected to globally created branch and project maintenance branch. If we want to use the power of Travis, must now show false positive/negative failures/successes, thus it has to use the correct source of code and tests.
Yes, this already works for SLE12, there is Devel:YaST:SLE-12:GA:Travis [1] project which builds SLE12 packages for Travis. [1] https://build.opensuse.org/project/monitor/YaST:SLE-12:GA:Travis -- Ladislav Slezák Appliance department / YaST Developer Lihovarská 1060/12 190 00 Prague 9 / Czech Republic tel: +420 284 028 960 lslezak@suse.com SUSE -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org
On Wed, Nov 05, 2014 at 11:06:52AM +0100, Martin Vidner wrote:
Hi,
As I said in the team call, I want to avoid uncertainty and inconsistencies, so please let's come to an agreement about Git branches for openSUSE 13.2.
Any outcome here? I have a patch for 13.2 now and would like to release an update. ciao Arvin -- Arvin Schnell, <aschnell@suse.de> Senior Software Engineer, Research & Development SUSE LINUX GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 21284 (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 11/14/2014 01:59 PM, Arvin Schnell wrote:
On Wed, Nov 05, 2014 at 11:06:52AM +0100, Martin Vidner wrote:
Hi,
As I said in the team call, I want to avoid uncertainty and inconsistencies, so please let's come to an agreement about Git branches for openSUSE 13.2.
Any outcome here? I have a patch for 13.2 now and would like to release an update.
Same here. https://github.com/yast/yast-firstboot/pull/11 -- 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 Wed, 5 Nov 2014 11:06:52 +0100 Martin Vidner <mvidner@suse.cz> wrote:
Hi,
As I said in the team call, I want to avoid uncertainty and inconsistencies, so please let's come to an agreement about Git branches for openSUSE 13.2.
Hi I created this branch now for all modules. branch name is openSUSE-13_2 It is made globally for all modules that exists in opensuse. It also set properly Rakefile, so you can follow http://yastgithubio.readthedocs.org/en/latest/maintenance-branches/ with howto how to submit task. Only tricky part is to base branch on proper commit as we do it quite late, so I cannot simple make it from master. I took version in 13.2 and then base branch on commit that change version number in spec file as the best approximation I found. If something is wrong, then you can contact me and I can recreate branch to be based on correct branch. And as a bonus I also improve script to create maintenance branch with ability to be based on commit: https://github.com/yast/yast-devtools/pull/69 As Devel project is used: https://build.opensuse.org/project/show/YaST:openSUSE:13.2 Josef
participants (6)
-
Ancor Gonzalez Sosa -
Arvin Schnell -
Josef Reidinger -
Ladislav Slezak -
Lukas Ocilka -
Martin Vidner