[ACS44] ready to abandon 4.4-forward

[Daan Hoogland <da...@gmail.com>]

ok, thanks Gaurav,

There is no more reason to maintain 4.4-forward. I will keep it around
for a week off cooling period and then delete it.

Please in line with our newly approved way of working [1] make a
branch off 4.4 for any work you need to go in 4.4.1 and call for a
merge of that branch when ready. As the diff to master is to big at
this moment, 4.4 will adopt the new way of working but be on it's own.
read the wiki [2] under heading "Proposed Gitflow based Check-in
Process".

with some ammendament from that page:

This would be the flow for a hot fix

branch off from the release branch (was: tag on master). in this case
it would be 4.4 (was: release/4.4.0)
commit the fixes in hotfix-<jira ticket> (was: hotfix/4.4.1)
call for me for the merge untill I do the release
port (was: merge) to develop
port (was: merge) to master and update tags
delete hot fix branch

Note that my change of this procedure is only for the 4.4 (and maybe
still 4.3) branch As Leo [3] has shown it is not feasible to extend
the new way of working into these old branches


[1] http://markmail.org/message/h7nh6ozseien7ezh
[2] https://cwiki.apache.org/confluence/display/CLOUDSTACK/Git
[3] http://markmail.org/message/on2l5n6uaucpuuwf

I will get the systemvm upgrade path as inspired by the 4.3 one in and
propose a 4.4.1.

kind regards,
Daan

On Mon, Aug 4, 2014 at 6:43 AM, Gaurav Aradhye
<ga...@clogeny.com> wrote:
> Yes Daan, the one with (-) is the one to keep.
>
> Regards,
> Gaurav
>
>
> On Mon, Aug 4, 2014 at 12:11 AM, Daan Hoogland <da...@gmail.com>
> wrote:
>
>> H test developers,
>>
>> One of the diffs between 4.4 and 4.4-forward I am not sure of is the
>> folowing
>>
>> diff --git a/test/integration/smoke/test_network.py
>> b/test/integration/smoke/test_network.py
>> index 988a162..4943b47 100644
>> --- a/test/integration/smoke/test_network.py
>> +++ b/test/integration/smoke/test_network.py
>> @@ -383,13 +383,12 @@ class TestPortForwarding(cloudstackTestCase):
>>
>>          try:
>>              nat_rule.delete(self.apiclient)
>> -        except Exception as e:
>> -            self.fail("NAT Rule Deletion Failed: %s" % e)
>> -
>> -        # NAT rule listing should fail as the nat rule does not exist
>> -        with self.assertRaises(Exception):
>> -            list_nat_rules(self.apiclient,
>> -                           id=nat_rule.id)
>> +            list_nat_rule_response = list_nat_rules(
>> +                                                self.apiclient,
>> +                                                id=nat_rule.id
>> +                                                )
>> +        except CloudstackAPIException:
>> +            self.fail("Nat Rule Deletion or Listing Failed")
>>
>>          # Check if the Public SSH port is inaccessible
>>          with self.assertRaises(Exception):
>>
>> It would seem that the original (- minus signs) is the one to keep,
>> please comment on this
>>
>> --
>> Daan
>>



-- 
Daan