From tserong at suse.com  Mon Feb 19 03:25:47 2018
From: tserong at suse.com (Tim Serong)
Date: Mon, 19 Feb 2018 21:25:47 +1100
Subject: [Deepsea-users] Backports? Forwardports?
Message-ID: <6bbf3763-faa1-4f84-d3d2-a12b01fedf81@suse.com>

Hi All,

Say I'm fixing something that's broken in DeepSea 0.8.2 in the SES5
branch.  Is the preferred procedure to fix it there (i.e. with a PR
against the SES5 branch), then forward-port the fix to master?  Or is it
to fix in master, then backport to SES5?

Thanks,

Tim
-- 
Tim Serong
Senior Clustering Engineer
SUSE
tserong at suse.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: tserong.vcf
Type: text/x-vcard
Size: 4 bytes
Desc: not available
URL: <http://lists.suse.com/pipermail/deepsea-users/attachments/20180219/598003e1/attachment.bin>

From jschmid at suse.de  Mon Feb 19 03:57:43 2018
From: jschmid at suse.de (Joshua Schmid)
Date: Mon, 19 Feb 2018 11:57:43 +0100
Subject: [Deepsea-users] Backports? Forwardports?
In-Reply-To: <6bbf3763-faa1-4f84-d3d2-a12b01fedf81@suse.com>
References: <6bbf3763-faa1-4f84-d3d2-a12b01fedf81@suse.com>
Message-ID: <20180219105743.q7w7u74kdb5txwdk@g127.suse.de>

Tim Serong <tserong at suse.com> wrote on Mon, 19. Feb 21:25:

Hey,

> Hi All,
> 
> Say I'm fixing something that's broken in DeepSea 0.8.2 in the SES5
> branch.  Is the preferred procedure to fix it there (i.e. with a PR
> against the SES5 branch), then forward-port the fix to master?  Or is it
> to fix in master, then backport to SES5?

We agreed on doing 'backwards' fixing where we first fix the issue in
master and then prepare a backport to ses4/5. There are of course
cornercases where SES5 has deviated too much from master in which we
will fix SES5.

> 
> Thanks,
> 
> Tim
> -- 
> Tim Serong
> Senior Clustering Engineer
> SUSE
> tserong at suse.com


> _______________________________________________
> Deepsea-users mailing list
> Deepsea-users at lists.suse.com
> http://lists.suse.com/mailman/listinfo/deepsea-users


-- 
Joshua Schmid
Software Engineer
SUSE Enterprise Storage

From ncutler at suse.cz  Mon Feb 19 04:43:19 2018
From: ncutler at suse.cz (Nathan Cutler)
Date: Mon, 19 Feb 2018 12:43:19 +0100
Subject: [Deepsea-users] Backports? Forwardports?
In-Reply-To: <6bbf3763-faa1-4f84-d3d2-a12b01fedf81@suse.com>
References: <6bbf3763-faa1-4f84-d3d2-a12b01fedf81@suse.com>
Message-ID: <79c7e32d-54df-8623-9a4c-35cea5224717@suse.cz>

> Say I'm fixing something that's broken in DeepSea 0.8.2 in the SES5
> branch.  Is the preferred procedure to fix it there (i.e. with a PR
> against the SES5 branch), then forward-port the fix to master?  Or is it
> to fix in master, then backport to SES5?

If you had written Ceph instead of DeepSea, then the answer would surely 
have been "always backport, never forwardport".

I have been doing it this way in DeepSea as well, and so far nobody has 
objected.

The advantage of this rule is consistency: you never get any 
cherry-picked commits in master, and all cherry-picked commits in the 
stable branches *must* mention a master SHA1.

Nathan

From tserong at suse.com  Tue Feb 20 00:48:33 2018
From: tserong at suse.com (Tim Serong)
Date: Tue, 20 Feb 2018 18:48:33 +1100
Subject: [Deepsea-users] Backports? Forwardports?
In-Reply-To: <79c7e32d-54df-8623-9a4c-35cea5224717@suse.cz>
References: <6bbf3763-faa1-4f84-d3d2-a12b01fedf81@suse.com>
	<79c7e32d-54df-8623-9a4c-35cea5224717@suse.cz>
Message-ID: <67f9f2c0-8699-0538-7fee-8dbc75379428@suse.com>

On 02/19/2018 10:43 PM, Nathan Cutler wrote:
>> Say I'm fixing something that's broken in DeepSea 0.8.2 in the SES5
>> branch.? Is the preferred procedure to fix it there (i.e. with a PR
>> against the SES5 branch), then forward-port the fix to master?? Or is it
>> to fix in master, then backport to SES5?
> 
> If you had written Ceph instead of DeepSea, then the answer would surely
> have been "always backport, never forwardport".
> 
> I have been doing it this way in DeepSea as well, and so far nobody has
> objected.
> 
> The advantage of this rule is consistency: you never get any
> cherry-picked commits in master, and all cherry-picked commits in the
> stable branches *must* mention a master SHA1.

Very good point.

Thanks,

Tim
-- 
Tim Serong
Senior Clustering Engineer
SUSE
tserong at suse.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: tserong.vcf
Type: text/x-vcard
Size: 4 bytes
Desc: not available
URL: <http://lists.suse.com/pipermail/deepsea-users/attachments/20180220/3aac3d72/attachment.bin>

From ncutler at suse.cz  Tue Feb 27 09:47:53 2018
From: ncutler at suse.cz (Nathan Cutler)
Date: Tue, 27 Feb 2018 17:47:53 +0100
Subject: [Deepsea-users] github CI status
Message-ID: <6700c506-98bd-3fb4-c520-367a8caf9c70@suse.cz>

JFYI We are migrating the github (SUSE/DeepSea.git) CI for PRs targeting 
the master branch, so the tests run on SLE15. Currently we are facing an 
issue with teuthology not being able to SSH into the SLE15 VMs that it 
creates. Currently working to fix this and will keep you posted.

Nathan