New commit detected on cfme/5.3.z: https://code.engineering.redhat.com/gerrit/gitweb?p=cfme.git;a=commitdiff;h=adcb8a77598b0c946cc190307945e07bca89560f commit adcb8a77598b0c946cc190307945e07bca89560f Author: Jason Frey <jfrey> AuthorDate: Thu Apr 2 17:55:58 2015 -0400 Commit: Jason Frey <jfrey> CommitDate: Tue Apr 7 14:01:44 2015 -0400 Add new Amazon D2 instance types and deprecate the HS1 instance type. Fixes #2477 https://bugzilla.redhat.com/show_bug.cgi?id=1208698 https://bugzilla.redhat.com/show_bug.cgi?id=1209168 Conflicts: vmdb/spec/models/ems_refresh/refreshers/ec2_refresher_spec.rb lib/Amazon/MiqEc2InstanceTypes.rb | 124 ++++++++++++++++++--- .../refreshers/ec2_refresher_other_region_spec.rb | 4 +- .../ems_refresh/refreshers/ec2_refresher_spec.rb | 4 +- 3 files changed, 112 insertions(+), 20 deletions(-)
New commit detected on cfme/5.3.z: https://code.engineering.redhat.com/gerrit/gitweb?p=cfme.git;a=commitdiff;h=1cac43a24c8e95ffc81ce5440d7ffb1673c90d14 commit 1cac43a24c8e95ffc81ce5440d7ffb1673c90d14 Merge: ac014c0 adcb8a7 Author: Brandon Dunne <bdunne> AuthorDate: Tue Apr 7 17:09:43 2015 -0400 Commit: Brandon Dunne <bdunne> CommitDate: Tue Apr 7 17:09:43 2015 -0400 Merge branch '5.3.z-add_new_ec2_instances' into '5.3.z' 5.3.z: Add new Amazon D2 instance types and deprecate the HS1 instance type Upstream merged PR: https://github.com/ManageIQ/manageiq/pull/2514 Also had to copy in the changes in https://github.com/ManageIQ/manageiq/pull/745, so that there would not be conflicts/errors when bringing in the new instance types. Note that there were conflicts on the cherry-pick, but those were spec only, and are because OrchestrationStack* was added to the upstream tests. https://bugzilla.redhat.com/show_bug.cgi?id=1208698 https://bugzilla.redhat.com/show_bug.cgi?id=1209168 This also has to go to 5.3.4, which I'll make an MR for. See merge request !26 lib/Amazon/MiqEc2InstanceTypes.rb | 178 ++++++++++++++++++--- vmdb/app/models/ems_refresh/parsers/ec2.rb | 6 +- .../refreshers/ec2_refresher_other_region_spec.rb | 4 +- .../ems_refresh/refreshers/ec2_refresher_spec.rb | 4 +- 4 files changed, 161 insertions(+), 31 deletions(-)
New commit detected on cfme/5.3.4: https://code.engineering.redhat.com/gerrit/gitweb?p=cfme.git;a=commitdiff;h=71f5a05a000fce1ba87a9fa1150e9b1c29c0e60f commit 71f5a05a000fce1ba87a9fa1150e9b1c29c0e60f Author: Jason Frey <jfrey> AuthorDate: Thu Apr 2 17:55:58 2015 -0400 Commit: Jason Frey <jfrey> CommitDate: Tue Apr 7 14:08:59 2015 -0400 Add new Amazon D2 instance types and deprecate the HS1 instance type. Fixes #2477 https://bugzilla.redhat.com/show_bug.cgi?id=1208698 https://bugzilla.redhat.com/show_bug.cgi?id=1209168 Conflicts: vmdb/spec/models/ems_refresh/refreshers/ec2_refresher_spec.rb lib/Amazon/MiqEc2InstanceTypes.rb | 124 ++++++++++++++++++--- .../refreshers/ec2_refresher_other_region_spec.rb | 4 +- .../ems_refresh/refreshers/ec2_refresher_spec.rb | 4 +- 3 files changed, 112 insertions(+), 20 deletions(-)
This is not present in 5.3.4.2.20150415125246 - Should it be?
According to the git tree, this *should* be in 5.3.4.2. https://code.engineering.redhat.com/gerrit/gitweb?p=cfme.git;a=shortlog;h=f5d5c91efc07eb0a4e4cbfef1c7cd3807ff1ae55 Do you see anything else from 5.3.4.2 missing that should be there (curious if the build was off the wrong tag or something)?
The commit to the 5.3.4 branch was done on April 7 The 5.3.4.2 tag on the 5.3.4 branch was made on April 13 The 5.3.z build against the 5.3.4.2 tag (on the 5.3.4 branch) was started and completed on April 15. I just checked my local copy used to create the 5.3.4.2 build and for: manageiq/vmdb/spec/models/ems_refresh/refreshers/ec2_refresher_spec.rb I see the April 7 commits,..as an example: - Flavor.count.should == 43 + Flavor.count.should == 47 I see the value of 47
And I see the values in the file, but unless I'm going nuts, I don't see those changes reflected in the UI. Allow me a little more time, and I'll get a ScreenShot.
Good to go. Verified and working fine in 5.3.4.2.20150415125246_f5d5c91. Now appliance displays the below mentioned D2 instances for HVM ami's. d2.xlarge: D2 Extra Large d2.2xlarge: D2 Double Extra Large d2.4xlarge: D2 Quadruple Extra Large d2.8xlarge: D2 Eight Extra Large
Since the problem described in this bug report should be resolved in a recent advisory, it has been closed with a resolution of ERRATA. For information on the advisory, and where to find the updated files, follow the link below. If the solution does not work for you, open a new bug report. https://rhn.redhat.com/errata/RHBA-2015-0890.html