migrating openstack-swift out of labs

[Adrian Cole <ad...@gmail.com>]

Hi, team. Hoping for your help on this one.

So openstack-swift, rax-cloudfiles* in labs are ready to go... at
least the version on the master branch. The 1.8.x branch hasn't been
kept up.

If the following works, I think it would be best in order to get
things up and out of labs in a stable way.

1. source import master version of openstack-swift, rax-cloudfiles* as
a pull request into jclouds/jclouds
2. cherry-pick that, correcting for guava version discrepancies onto
jclouds/jclouds 1.8.x branch.

While this wouldn't retain history, we can cite the
jclouds-labs-openstack repo for history. Other ideas welcome.

-A

Re: migrating openstack-swift out of labs

[Ignasi Barrera <ig...@gmail.com>]

BTW, you can have a look at the commit history and the history of the
files in the main repo and the history of chef specific files such as
the ChefApi)

On 8 October 2014 18:04, Ignasi Barrera <ig...@gmail.com> wrote:
> It seems possible. I've just merged jclouds-chef/core and
> jclouds-chef/enterprise to jclouds/apis/core and
> jclouds/providers/enterprisechef. See it at:
> https://github.com/nacx/jclouds/tree/jclouds-chef-merge
>
> I'm writing a page on the wiki with the steps I followed. If we all
> agree, we could discuss the procedure and use it.
> I'll share the page once I've finished it.
>
> On 8 October 2014 18:01, Jeremy Daggett <je...@rackspace.com> wrote:
>> I looked into filter-branch a while back just for this purpose.! If we
>> could retain history, that would be ideal. Let me get my SCM hat on and
>> take a look.
>>
>> /jd
>>
>> On 10/8/14, 7:43 AM, "Ignasi Barrera" <na...@apache.org> wrote:
>>
>>>Actually, I'm still trying to keep the history with a couple more
>>>tests. If I can find a way, I'll post a howto on the wiki.
>>>
>>>On 8 October 2014 16:30, Ignasi Barrera <ig...@gmail.com> wrote:
>>>> The same happens to chef. I've tried to find a way to keep history,
>>>> but I haven't found any. Take into account that moving to the main
>>>> repo also implies a "restructure" of the project. In the case of Chef,
>>>> the "core" folder is moved to "apis", and the "enterprisechef" one to
>>>> "providers".
>>>>
>>>> On 8 October 2014 16:21, Andrew Phillips <ap...@qrmedia.com> wrote:
>>>>>> While this wouldn't retain history, we can cite the
>>>>>> jclouds-labs-openstack repo for history. Other ideas welcome.
>>>>>
>>>>>
>>>>> Sounds good to me - what are we doing with jclouds-chef, which is also
>>>>> undergoing a similar merge at this time?
>>>>>
>>>>> Would filter-branch [1] help in preserving history in some way? Could
>>>>>we
>>>>> "convert" the repo to a branch on master and submit a PR to merge that?
>>>>>
>>>>> ap
>>>>>
>>>>> [1] http://git-scm.com/docs/git-filter-branch
>>

Re: migrating openstack-swift out of labs

[Ignasi Barrera <ig...@gmail.com>]

It seems possible. I've just merged jclouds-chef/core and
jclouds-chef/enterprise to jclouds/apis/core and
jclouds/providers/enterprisechef. See it at:
https://github.com/nacx/jclouds/tree/jclouds-chef-merge

I'm writing a page on the wiki with the steps I followed. If we all
agree, we could discuss the procedure and use it.
I'll share the page once I've finished it.

On 8 October 2014 18:01, Jeremy Daggett <je...@rackspace.com> wrote:
> I looked into filter-branch a while back just for this purpose.! If we
> could retain history, that would be ideal. Let me get my SCM hat on and
> take a look.
>
> /jd
>
> On 10/8/14, 7:43 AM, "Ignasi Barrera" <na...@apache.org> wrote:
>
>>Actually, I'm still trying to keep the history with a couple more
>>tests. If I can find a way, I'll post a howto on the wiki.
>>
>>On 8 October 2014 16:30, Ignasi Barrera <ig...@gmail.com> wrote:
>>> The same happens to chef. I've tried to find a way to keep history,
>>> but I haven't found any. Take into account that moving to the main
>>> repo also implies a "restructure" of the project. In the case of Chef,
>>> the "core" folder is moved to "apis", and the "enterprisechef" one to
>>> "providers".
>>>
>>> On 8 October 2014 16:21, Andrew Phillips <ap...@qrmedia.com> wrote:
>>>>> While this wouldn't retain history, we can cite the
>>>>> jclouds-labs-openstack repo for history. Other ideas welcome.
>>>>
>>>>
>>>> Sounds good to me - what are we doing with jclouds-chef, which is also
>>>> undergoing a similar merge at this time?
>>>>
>>>> Would filter-branch [1] help in preserving history in some way? Could
>>>>we
>>>> "convert" the repo to a branch on master and submit a PR to merge that?
>>>>
>>>> ap
>>>>
>>>> [1] http://git-scm.com/docs/git-filter-branch
>

Re: migrating openstack-swift out of labs

[Jeremy Daggett <je...@RACKSPACE.COM>]

I looked into filter-branch a while back just for this purpose.! If we
could retain history, that would be ideal. Let me get my SCM hat on and
take a look.

/jd

On 10/8/14, 7:43 AM, "Ignasi Barrera" <na...@apache.org> wrote:

>Actually, I'm still trying to keep the history with a couple more
>tests. If I can find a way, I'll post a howto on the wiki.
>
>On 8 October 2014 16:30, Ignasi Barrera <ig...@gmail.com> wrote:
>> The same happens to chef. I've tried to find a way to keep history,
>> but I haven't found any. Take into account that moving to the main
>> repo also implies a "restructure" of the project. In the case of Chef,
>> the "core" folder is moved to "apis", and the "enterprisechef" one to
>> "providers".
>>
>> On 8 October 2014 16:21, Andrew Phillips <ap...@qrmedia.com> wrote:
>>>> While this wouldn't retain history, we can cite the
>>>> jclouds-labs-openstack repo for history. Other ideas welcome.
>>>
>>>
>>> Sounds good to me - what are we doing with jclouds-chef, which is also
>>> undergoing a similar merge at this time?
>>>
>>> Would filter-branch [1] help in preserving history in some way? Could
>>>we
>>> "convert" the repo to a branch on master and submit a PR to merge that?
>>>
>>> ap
>>>
>>> [1] http://git-scm.com/docs/git-filter-branch

Re: migrating openstack-swift out of labs

[Ignasi Barrera <na...@apache.org>]

Actually, I'm still trying to keep the history with a couple more
tests. If I can find a way, I'll post a howto on the wiki.

On 8 October 2014 16:30, Ignasi Barrera <ig...@gmail.com> wrote:
> The same happens to chef. I've tried to find a way to keep history,
> but I haven't found any. Take into account that moving to the main
> repo also implies a "restructure" of the project. In the case of Chef,
> the "core" folder is moved to "apis", and the "enterprisechef" one to
> "providers".
>
> On 8 October 2014 16:21, Andrew Phillips <ap...@qrmedia.com> wrote:
>>> While this wouldn't retain history, we can cite the
>>> jclouds-labs-openstack repo for history. Other ideas welcome.
>>
>>
>> Sounds good to me - what are we doing with jclouds-chef, which is also
>> undergoing a similar merge at this time?
>>
>> Would filter-branch [1] help in preserving history in some way? Could we
>> "convert" the repo to a branch on master and submit a PR to merge that?
>>
>> ap
>>
>> [1] http://git-scm.com/docs/git-filter-branch

Re: migrating openstack-swift out of labs

[Adrian Cole <ad...@gmail.com>]

Already mentioned, but I think this is more helpful in the isolated
case of chef, which wasn't labs, and the ideal case of labs where
something is promoted within a few weeks to months of it being
started.

The crap-case of many labs providers is that we will be importing
random history of more than a year (see openstack-swift and soon
azurecompute). I don't see much value in that, and figured I should
voice this clearly. In other words, in some cases cure is worse than
the disease.

-A

On Wed, Oct 8, 2014 at 9:28 AM, Ignasi Barrera <na...@apache.org> wrote:
> So I've written down the steps I followed in this page on the wiki
> (note that I reference the original tutorial but the commands are
> slightly different):
> https://wiki.apache.org/jclouds/PromoteProvider
>
> The result can be checked out at:
> https://github.com/nacx/jclouds/tree/jclouds-chef-merge
>
> If you find the procedure OK, we can establish it as the way to
> promote providers.
>
> On 8 October 2014 18:21, Adrian Cole <ad...@gmail.com> wrote:
>> OK so unless we have nothing better to do but try to preserve the
>> history of maintenance of openstack-swift between the time it was
>> written, the few minor changes, and boatload of maintenance, I'd
>> suggest we just merge the following.
>>
>> openstack-swift out of labs
>> https://github.com/jclouds/jclouds/pull/563 - master
>> https://github.com/jclouds/jclouds/pull/564 - 1.8.x
>>
>> -A
>>
>> On Wed, Oct 8, 2014 at 7:38 AM, Adrian Cole <ad...@gmail.com> wrote:
>>> Wires crossed!
>>>
>>> Ok. I will raise a source import pull request for openstack-swift and
>>> friends. I suppose I could simultaneously for 1.8.x just wait until we are
>>> ready to merge that.
>>>
>>> -A
>>>
>>> On Oct 8, 2014 7:31 AM, "Ignasi Barrera" <ig...@gmail.com> wrote:
>>>>
>>>> The same happens to chef. I've tried to find a way to keep history,
>>>> but I haven't found any. Take into account that moving to the main
>>>> repo also implies a "restructure" of the project. In the case of Chef,
>>>> the "core" folder is moved to "apis", and the "enterprisechef" one to
>>>> "providers".
>>>>
>>>> On 8 October 2014 16:21, Andrew Phillips <ap...@qrmedia.com> wrote:
>>>> >> While this wouldn't retain history, we can cite the
>>>> >> jclouds-labs-openstack repo for history. Other ideas welcome.
>>>> >
>>>> >
>>>> > Sounds good to me - what are we doing with jclouds-chef, which is also
>>>> > undergoing a similar merge at this time?
>>>> >
>>>> > Would filter-branch [1] help in preserving history in some way? Could we
>>>> > "convert" the repo to a branch on master and submit a PR to merge that?
>>>> >
>>>> > ap
>>>> >
>>>> > [1] http://git-scm.com/docs/git-filter-branch

Re: migrating openstack-swift out of labs

[Ignasi Barrera <na...@apache.org>]

So I've written down the steps I followed in this page on the wiki
(note that I reference the original tutorial but the commands are
slightly different):
https://wiki.apache.org/jclouds/PromoteProvider

The result can be checked out at:
https://github.com/nacx/jclouds/tree/jclouds-chef-merge

If you find the procedure OK, we can establish it as the way to
promote providers.

On 8 October 2014 18:21, Adrian Cole <ad...@gmail.com> wrote:
> OK so unless we have nothing better to do but try to preserve the
> history of maintenance of openstack-swift between the time it was
> written, the few minor changes, and boatload of maintenance, I'd
> suggest we just merge the following.
>
> openstack-swift out of labs
> https://github.com/jclouds/jclouds/pull/563 - master
> https://github.com/jclouds/jclouds/pull/564 - 1.8.x
>
> -A
>
> On Wed, Oct 8, 2014 at 7:38 AM, Adrian Cole <ad...@gmail.com> wrote:
>> Wires crossed!
>>
>> Ok. I will raise a source import pull request for openstack-swift and
>> friends. I suppose I could simultaneously for 1.8.x just wait until we are
>> ready to merge that.
>>
>> -A
>>
>> On Oct 8, 2014 7:31 AM, "Ignasi Barrera" <ig...@gmail.com> wrote:
>>>
>>> The same happens to chef. I've tried to find a way to keep history,
>>> but I haven't found any. Take into account that moving to the main
>>> repo also implies a "restructure" of the project. In the case of Chef,
>>> the "core" folder is moved to "apis", and the "enterprisechef" one to
>>> "providers".
>>>
>>> On 8 October 2014 16:21, Andrew Phillips <ap...@qrmedia.com> wrote:
>>> >> While this wouldn't retain history, we can cite the
>>> >> jclouds-labs-openstack repo for history. Other ideas welcome.
>>> >
>>> >
>>> > Sounds good to me - what are we doing with jclouds-chef, which is also
>>> > undergoing a similar merge at this time?
>>> >
>>> > Would filter-branch [1] help in preserving history in some way? Could we
>>> > "convert" the repo to a branch on master and submit a PR to merge that?
>>> >
>>> > ap
>>> >
>>> > [1] http://git-scm.com/docs/git-filter-branch

Re: migrating openstack-swift out of labs

[Adrian Cole <ad...@gmail.com>]

OK so unless we have nothing better to do but try to preserve the
history of maintenance of openstack-swift between the time it was
written, the few minor changes, and boatload of maintenance, I'd
suggest we just merge the following.

openstack-swift out of labs
https://github.com/jclouds/jclouds/pull/563 - master
https://github.com/jclouds/jclouds/pull/564 - 1.8.x

-A

On Wed, Oct 8, 2014 at 7:38 AM, Adrian Cole <ad...@gmail.com> wrote:
> Wires crossed!
>
> Ok. I will raise a source import pull request for openstack-swift and
> friends. I suppose I could simultaneously for 1.8.x just wait until we are
> ready to merge that.
>
> -A
>
> On Oct 8, 2014 7:31 AM, "Ignasi Barrera" <ig...@gmail.com> wrote:
>>
>> The same happens to chef. I've tried to find a way to keep history,
>> but I haven't found any. Take into account that moving to the main
>> repo also implies a "restructure" of the project. In the case of Chef,
>> the "core" folder is moved to "apis", and the "enterprisechef" one to
>> "providers".
>>
>> On 8 October 2014 16:21, Andrew Phillips <ap...@qrmedia.com> wrote:
>> >> While this wouldn't retain history, we can cite the
>> >> jclouds-labs-openstack repo for history. Other ideas welcome.
>> >
>> >
>> > Sounds good to me - what are we doing with jclouds-chef, which is also
>> > undergoing a similar merge at this time?
>> >
>> > Would filter-branch [1] help in preserving history in some way? Could we
>> > "convert" the repo to a branch on master and submit a PR to merge that?
>> >
>> > ap
>> >
>> > [1] http://git-scm.com/docs/git-filter-branch

Re: migrating openstack-swift out of labs

[Ignasi Barrera <ig...@gmail.com>]

The same happens to chef. I've tried to find a way to keep history,
but I haven't found any. Take into account that moving to the main
repo also implies a "restructure" of the project. In the case of Chef,
the "core" folder is moved to "apis", and the "enterprisechef" one to
"providers".

On 8 October 2014 16:21, Andrew Phillips <ap...@qrmedia.com> wrote:
>> While this wouldn't retain history, we can cite the
>> jclouds-labs-openstack repo for history. Other ideas welcome.
>
>
> Sounds good to me - what are we doing with jclouds-chef, which is also
> undergoing a similar merge at this time?
>
> Would filter-branch [1] help in preserving history in some way? Could we
> "convert" the repo to a branch on master and submit a PR to merge that?
>
> ap
>
> [1] http://git-scm.com/docs/git-filter-branch

Re: migrating openstack-swift out of labs

[Andrew Phillips <ap...@qrmedia.com>]

> While this wouldn't retain history, we can cite the
> jclouds-labs-openstack repo for history. Other ideas welcome.

Sounds good to me - what are we doing with jclouds-chef, which is also  
undergoing a similar merge at this time?

Would filter-branch [1] help in preserving history in some way? Could  
we "convert" the repo to a branch on master and submit a PR to merge  
that?

ap

[1] http://git-scm.com/docs/git-filter-branch