juju-core

Merge lp://staging/~wallyworld/juju-core/ec2-root-disk-constraint-1.18 into lp://staging/juju-core/1.18

  1. ec2-root-disk-constraint-1.18
  2. Merge into 1.18
Proposed by Ian Booth
Status: Merged
Approved by: Ian Booth
Approved revision: no longer in the source branch.
Merged at revision: 2296
Proposed branch: lp://staging/~wallyworld/juju-core/ec2-root-disk-constraint-1.18
Merge into: lp://staging/juju-core/1.18
Diff against target: 64 lines (+7/-5)
3 files modified
environs/instances/instancetype.go (+1/-1)
environs/instances/instancetype_test.go (+0/-4)
provider/ec2/image_test.go (+6/-0)
To merge this branch: bzr merge lp://staging/~wallyworld/juju-core/ec2-root-disk-constraint-1.18
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+221810@code.staging.launchpad.net

Commit message

Fix root-disk consraints on ec2

EC2 instance types do not include a root
disk size as this is set on instance
creation. This was causing the contraints
matching to fail when root disk was specified.
The fix is to ignore 0 root disk values when
matching constraints.

https://codereview.appspot.com/106750044/

Description of the change

Fix root-disk consraints on ec2

EC2 instance types do not include a root
disk size as this is set on instance
creation. This was causing the contraints
matching to fail when root disk was specified.
The fix is to ignore 0 root disk values when
matching constraints.

https://codereview.appspot.com/106750044/

To post a comment you must log in.
Revision history for this message
Go Bot (go-bot) wrote :
Download full text (10.6 KiB)

The attempt to merge lp:~wallyworld/juju-core/ec2-root-disk-constraint-1.18 into lp:juju-core/1.18 failed. Below is the output from the failed tests.

ok launchpad.net/juju-core 0.012s
ok launchpad.net/juju-core/agent 1.153s
ok launchpad.net/juju-core/agent/mongo 0.579s
ok launchpad.net/juju-core/agent/tools 0.194s
ok launchpad.net/juju-core/bzr 5.306s
ok launchpad.net/juju-core/cert 2.925s
ok launchpad.net/juju-core/charm 0.401s
? launchpad.net/juju-core/charm/hooks [no test files]
? launchpad.net/juju-core/charm/testing [no test files]
ok launchpad.net/juju-core/cloudinit 0.030s
ok launchpad.net/juju-core/cloudinit/sshinit 0.879s
ok launchpad.net/juju-core/cmd 0.162s
ok launchpad.net/juju-core/cmd/charm-admin 0.289s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/envcmd 0.171s
ok launchpad.net/juju-core/cmd/juju 215.456s
ok launchpad.net/juju-core/cmd/jujud 65.868s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 8.868s
? launchpad.net/juju-core/cmd/plugins/juju-restore [no test files]
ok launchpad.net/juju-core/cmd/plugins/local 0.160s
? launchpad.net/juju-core/cmd/plugins/local/juju-local [no test files]
ok launchpad.net/juju-core/constraints 0.021s
ok launchpad.net/juju-core/container 0.046s
ok launchpad.net/juju-core/container/factory 0.047s
ok launchpad.net/juju-core/container/kvm 0.178s
ok launchpad.net/juju-core/container/kvm/mock 0.051s
? launchpad.net/juju-core/container/kvm/testing [no test files]
ok launchpad.net/juju-core/container/lxc 4.317s
? launchpad.net/juju-core/container/lxc/mock [no test files]
? launchpad.net/juju-core/container/lxc/testing [no test files]
? launchpad.net/juju-core/container/testing [no test files]
ok launchpad.net/juju-core/downloader 5.238s
ok launchpad.net/juju-core/environs 2.299s
ok launchpad.net/juju-core/environs/bootstrap 10.881s
ok launchpad.net/juju-core/environs/cloudinit 0.440s
ok launchpad.net/juju-core/environs/config 2.005s
ok launchpad.net/juju-core/environs/configstore 0.028s
ok launchpad.net/juju-core/environs/filestorage 0.026s
ok launchpad.net/juju-core/environs/httpstorage 0.776s
ok launchpad.net/juju-core/environs/imagemetadata 0.490s
? launchpad.net/juju-core/environs/imagemetadata/testing [no test files]
ok launchpad.net/juju-core/environs/instances 0.051s
ok launchpad.net/juju-core/environs/jujutest 0.166s
ok launchpad.net/juju-core/environs/manual 12.053s
ok launchpad.net/juju-core/environs/simplestreams 0.242s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 0.914s
ok launchpad.net/juju-core/environs/storage 0.928s
ok launchpad.net/juju-core/environs/sync 45.285s
ok launchpad.net/juju-core/environs/testing 0.180s
ok launchpad.net/juju-core/environs/tools 4.461s
? launchpad.net/juju-core/environs/tools/testing [no test files]
ok launchpad.net/juju-core/errors 0.012s
ok launchpad.net/juju-core/instance 0.021s
? launchpad.net/juju-core/instance/testing [no test files]
ok launchpad.net/juju-...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: