Re: [openstack-dev] stable/kilo (and master grenade) will be blocked until version bumps on kilo are merged

2015-07-30 Thread Alan Pevec
Agreed, after 2015.1.2 version bumps are merged, I'll propose version= line removals on stable branches so this situation doesn't happen again. Err, no. Post-versioning means all projects use semantic rather than date-based version numbers, which happens starting with *liberty*. Remaining

Re: [openstack-dev] stable/kilo (and master grenade) will be blocked until version bumps on kilo are merged

2015-07-30 Thread Thierry Carrez
Alan Pevec wrote: I think pushing them up earlier would indeed make it easier for folk. Indeed, but it's too late now. But its not as good as using post-versioniing :) Agreed, after 2015.1.2 version bumps are merged, I'll propose version= line removals on stable branches so this

Re: [openstack-dev] stable/kilo (and master grenade) will be blocked until version bumps on kilo are merged

2015-07-30 Thread Alan Pevec
The way we did it in the past was to push the setup.cfg version=2015.1.2 bump BEFORE we tag, then once that is merged, tag the previous commit in history as 2015.1.1. That way you avoid the lockstep (and ensure no intermediary badly-versioned tarball can be produced). Any reason why that

Re: [openstack-dev] stable/kilo (and master grenade) will be blocked until version bumps on kilo are merged

2015-07-29 Thread Robert Collins
On 30 July 2015 at 01:39, Sean Dague s...@dague.net wrote: So, after every release a giant amount of patches all have to land lock step or everything is broken? No, its not that bad. The *tagged* commit is fine forever. The *first* commit in each branch has to be the identification of the

Re: [openstack-dev] stable/kilo (and master grenade) will be blocked until version bumps on kilo are merged

2015-07-29 Thread Matt Riedemann
On 7/29/2015 12:45 PM, Sean Dague wrote: On 07/29/2015 01:21 PM, Robert Collins wrote: On 30 July 2015 at 01:39, Sean Dague s...@dague.net wrote: So, after every release a giant amount of patches all have to land lock step or everything is broken? No, its not that bad. The *tagged*

Re: [openstack-dev] stable/kilo (and master grenade) will be blocked until version bumps on kilo are merged

2015-07-29 Thread Robert Collins
On 30 July 2015 at 09:02, Matt Riedemann mrie...@linux.vnet.ibm.com wrote: On 7/29/2015 12:45 PM, Sean Dague wrote: I thought Matt said there was a coupling here between stable/kilo and master. That would imply that all of master would need changes as well, right? And block merges until

Re: [openstack-dev] stable/kilo (and master grenade) will be blocked until version bumps on kilo are merged

2015-07-29 Thread Robert Collins
On 30 July 2015 at 05:45, Sean Dague s...@dague.net wrote: On 07/29/2015 01:21 PM, Robert Collins wrote: However - see above - I think the impact of the release is being overstated. If I have that wrong, please help me understand whats happened here. I thought Matt said there was a coupling

Re: [openstack-dev] stable/kilo (and master grenade) will be blocked until version bumps on kilo are merged

2015-07-29 Thread Alan Pevec
I think pushing them up earlier would indeed make it easier for folk. Indeed, but it's too late now. But its not as good as using post-versioniing :) Agreed, after 2015.1.2 version bumps are merged, I'll propose version= line removals on stable branches so this situation doesn't happen again.

Re: [openstack-dev] stable/kilo (and master grenade) will be blocked until version bumps on kilo are merged

2015-07-29 Thread Sean Dague
On 07/29/2015 01:21 PM, Robert Collins wrote: On 30 July 2015 at 01:39, Sean Dague s...@dague.net wrote: So, after every release a giant amount of patches all have to land lock step or everything is broken? No, its not that bad. The *tagged* commit is fine forever. The *first* commit

Re: [openstack-dev] stable/kilo (and master grenade) will be blocked until version bumps on kilo are merged

2015-07-29 Thread Sean Dague
On 07/29/2015 09:29 AM, Matt Riedemann wrote: On 7/29/2015 8:17 AM, Matt Riedemann wrote: stable/kilo and grenade (master) jobs are going to be blocked for some projects until the kilo 2015.1.2 version changes are merged:

Re: [openstack-dev] stable/kilo (and master grenade) will be blocked until version bumps on kilo are merged

2015-07-29 Thread Doug Hellmann
Excerpts from Sean Dague's message of 2015-07-29 09:54:08 -0400: On 07/29/2015 09:49 AM, Jeremy Stanley wrote: On 2015-07-29 09:39:46 -0400 (-0400), Sean Dague wrote: On 07/29/2015 09:29 AM, Matt Riedemann wrote: On 7/29/2015 8:17 AM, Matt Riedemann wrote: [...] ValueError: git history

Re: [openstack-dev] stable/kilo (and master grenade) will be blocked until version bumps on kilo are merged

2015-07-29 Thread Jeremy Stanley
On 2015-07-29 10:32:09 -0400 (-0400), Doug Hellmann wrote: Another solution is to move all projects to post-versioning and stop setting a version in setup.cfg. That would mean having all projects following the release:cycle-with-intermediary model, and I intend to propose making that change

Re: [openstack-dev] stable/kilo (and master grenade) will be blocked until version bumps on kilo are merged

2015-07-29 Thread Matt Riedemann
On 7/29/2015 9:32 AM, Doug Hellmann wrote: Excerpts from Sean Dague's message of 2015-07-29 09:54:08 -0400: On 07/29/2015 09:49 AM, Jeremy Stanley wrote: On 2015-07-29 09:39:46 -0400 (-0400), Sean Dague wrote: On 07/29/2015 09:29 AM, Matt Riedemann wrote: On 7/29/2015 8:17 AM, Matt

Re: [openstack-dev] stable/kilo (and master grenade) will be blocked until version bumps on kilo are merged

2015-07-29 Thread Jeremy Stanley
On 2015-07-29 09:39:46 -0400 (-0400), Sean Dague wrote: On 07/29/2015 09:29 AM, Matt Riedemann wrote: On 7/29/2015 8:17 AM, Matt Riedemann wrote: [...] ValueError: git history requires a target version of pbr.version.SemanticVersion(2015.1.2), but target version is

Re: [openstack-dev] stable/kilo (and master grenade) will be blocked until version bumps on kilo are merged

2015-07-29 Thread Matt Riedemann
On 7/29/2015 8:39 AM, Sean Dague wrote: On 07/29/2015 09:29 AM, Matt Riedemann wrote: On 7/29/2015 8:17 AM, Matt Riedemann wrote: stable/kilo and grenade (master) jobs are going to be blocked for some projects until the kilo 2015.1.2 version changes are merged:

Re: [openstack-dev] stable/kilo (and master grenade) will be blocked until version bumps on kilo are merged

2015-07-29 Thread Sean Dague
On 07/29/2015 09:49 AM, Jeremy Stanley wrote: On 2015-07-29 09:39:46 -0400 (-0400), Sean Dague wrote: On 07/29/2015 09:29 AM, Matt Riedemann wrote: On 7/29/2015 8:17 AM, Matt Riedemann wrote: [...] ValueError: git history requires a target version of pbr.version.SemanticVersion(2015.1.2),

Re: [openstack-dev] stable/kilo (and master grenade) will be blocked until version bumps on kilo are merged

2015-07-29 Thread Matt Riedemann
On 7/29/2015 8:17 AM, Matt Riedemann wrote: stable/kilo and grenade (master) jobs are going to be blocked for some projects until the kilo 2015.1.2 version changes are merged: https://review.openstack.org/#/q/I180de9d4f1f4ae385682ce40a3a695eb3acc4c43,n,z So avoid rechecks for grenade