Skip to content

Commit 9da002c

Browse files
authored
Merge pull request juju#9516 from hmlanigan/instance-types
juju#9516 ## Description of change Adding additional instance types for the ec2 provider. ## QA steps 1. juju bootstrap aws aws-controller <-- us-east-1 region 2. juju add-machine --constraints 'instance-type=m5a.xlarge' verify machine deploys
2 parents cb76808 + 573b6b3 commit 9da002c

File tree

4 files changed

+4080
-84
lines changed

4 files changed

+4080
-84
lines changed

provider/ec2/image_test.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ var findInstanceSpecTests = []struct {
4747
series: "xenial",
4848
arches: []string{"amd64"},
4949
cons: "cores=4",
50-
itype: "t3.xlarge",
50+
itype: "a1.xlarge",
5151
image: "ami-00000133",
5252
}, {
5353
series: "xenial",
5454
arches: []string{"amd64"},
5555
cons: "mem=10G",
56-
itype: "r5.large",
56+
itype: "r5a.large",
5757
image: "ami-00000133",
5858
}, {
5959
series: "xenial",
@@ -133,8 +133,11 @@ var findInstanceSpecTests = []struct {
133133
}
134134

135135
func (s *specSuite) TestFindInstanceSpec(c *gc.C) {
136+
size := len(findInstanceSpecTests)
136137
for i, test := range findInstanceSpecTests {
137-
c.Logf("\ntest %d: %q; %q; %q; %v", i, test.series, test.arches, test.cons, test.storage)
138+
c.Logf("\ntest %d of %d: %q; %q; %q; %q; %q; %v", i+1, size,
139+
test.series, test.arches, test.cons, test.itype, test.image,
140+
test.storage)
138141
stor := test.storage
139142
if len(stor) == 0 {
140143
stor = []string{ssdStorage, ebsStorage}

0 commit comments

Comments
 (0)