Merge lp:~axwalk/juju-core/lp1218329-azure-released-images into lp:~go-bot/juju-core/trunk

[Andrew Wilkins]

azure: default to released/precise images

Fixes bug #1218329

https://codereview.appspot.com/13464043/

azure: default to released/precise images

Fixes bug #1218329

https://codereview.appspot.com/13464043/

[Andrew Wilkins (axwalk)]

Reviewers: mp+183381_code.launchpad.net,

Message:
Please take a look.

Description:
azure: default to released/precise images

Fixes bug #1218329

https://code.launchpad.net/~axwalk/juju-core/lp1218329-azure-released-images/+merge/183381

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/13464043/

Affected files:
   A [revision details]
   M provider/azure/config.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20130902034049-oech4u0m5spe4r02
+New revision: <email address hidden>

Index: provider/azure/config.go
=== modified file 'provider/azure/config.go'
--- provider/azure/config.go 2013-08-26 23:13:31 +0000
+++ provider/azure/config.go 2013-09-02 05:13:41 +0000
@@ -147,9 +147,8 @@
    # Pick a simplestreams stream to select OS images from: daily or released
    # images, or any other stream available on simplestreams. Leave blank
for
    # released images.
- # For now, during development, only the daily 13.10 pre-release images
work.
- image-stream: daily
- default-series: saucy
+ # image-stream: ""
+ default-series: precise
  `

  func (prov azureEnvironProvider) BoilerplateConfig() string {

[John A Meinel (jameinel)]

LGTM.

I think we actually need to target whatever branch Dave Cheney brings
out for the 1.14 series, but we can land this in trunk and then land it
in 1.14 when we are able to.

https://codereview.appspot.com/13464043/diff/1/provider/azure/config.go
File provider/azure/config.go (right):

https://codereview.appspot.com/13464043/diff/1/provider/azure/config.go#newcode151
provider/azure/config.go:151: default-series: precise
Because the global DefaultSeries is precise, I would put this in a
comment.

https://codereview.appspot.com/13464043/

[Andrew Wilkins (axwalk)]

On 2013/09/02 05:41:58, jameinel wrote:
> LGTM.

> I think we actually need to target whatever branch Dave Cheney brings
out for
> the 1.14 series, but we can land this in trunk and then land it in
1.14 when we
> are able to.

https://codereview.appspot.com/13464043/diff/1/provider/azure/config.go
> File provider/azure/config.go (right):

https://codereview.appspot.com/13464043/diff/1/provider/azure/config.go#newcode151
> provider/azure/config.go:151: default-series: precise
> Because the global DefaultSeries is precise, I would put this in a
comment.

Done.

https://codereview.appspot.com/13464043/

[Dave Cheney (dave-cheney)]

Nice, here is a reminder to back port it ,
lp:~axwalk/juju-core/lp1218329-azure-released-images

On Mon, Sep 2, 2013 at 4:18 PM, Andrew Wilkins
<email address hidden> wrote:
> The proposal to merge lp:~axwalk/juju-core/lp1218329-azure-released-images into lp:juju-core has been updated.
>
> Status: Needs review => Approved
>
> For more details, see:
> https://code.launchpad.net/~axwalk/juju-core/lp1218329-azure-released-images/+merge/183381
> --
> https://code.launchpad.net/~axwalk/juju-core/lp1218329-azure-released-images/+merge/183381
> You are subscribed to branch lp:juju-core.

[Dave Cheney (dave-cheney)]

https://docs.google.com/a/canonical.com/document/d/1M_ZTAtVfz55U_jvzXaMEIZ2-yqPqjAeIIiQxEW7mfe0/edit

On Mon, Sep 2, 2013 at 4:09 PM, Andrew Wilkins
<email address hidden> wrote:
> On 2013/09/02 05:41:58, jameinel wrote:
>> LGTM.
>
>> I think we actually need to target whatever branch Dave Cheney brings
> out for
>> the 1.14 series, but we can land this in trunk and then land it in
> 1.14 when we
>> are able to.
>
>
> https://codereview.appspot.com/13464043/diff/1/provider/azure/config.go
>> File provider/azure/config.go (right):
>
>
> https://codereview.appspot.com/13464043/diff/1/provider/azure/config.go#newcode151
>> provider/azure/config.go:151: default-series: precise
>> Because the global DefaultSeries is precise, I would put this in a
> comment.
>
> Done.
>
> https://codereview.appspot.com/13464043/
>
> --
> https://code.launchpad.net/~axwalk/juju-core/lp1218329-azure-released-images/+merge/183381
> You are subscribed to branch lp:juju-core.

[Go Bot (go-bot)]

The attempt to merge lp:~axwalk/juju-core/lp1218329-azure-released-images into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core/agent 0.715s
ok launchpad.net/juju-core/agent/tools 0.237s
ok launchpad.net/juju-core/bzr 6.590s
ok launchpad.net/juju-core/cert 2.555s
ok launchpad.net/juju-core/charm 0.561s
? launchpad.net/juju-core/charm/hooks [no test files]
ok launchpad.net/juju-core/cloudinit 0.020s
ok launchpad.net/juju-core/cmd 0.290s
? launchpad.net/juju-core/cmd/builddb [no test files]
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/juju 117.556s

----------------------------------------------------------------------
FAIL: machine_test.go:377: MachineSuite.TestManageStateServesAPI

[LOG] 3.92903 INFO juju environs/testing: uploading FAKE tools 1.15.0-precise-amd64
[LOG] 3.95310 INFO juju.environs.boostrap bootstrapping environment "dummyenv"
[LOG] 3.95341 INFO juju.environs.tools reading tools with major.minor version 1.15
[LOG] 3.95343 INFO juju.environs.tools filtering tools by version: 1.15.0
[LOG] 3.95346 INFO juju.environs.tools filtering tools by series: precise
[LOG] 3.95368 DEBUG juju.environs.tools reading v1.15 tools
[LOG] 3.95372 DEBUG juju.environs.tools reading v1.15 tools
[LOG] 3.95376 DEBUG juju.environs.tools found 1.15.0-precise-amd64
[LOG] 3.95409 INFO juju environs/dummy: would pick tools from 1.15.0-precise-amd64
[LOG] 3.99639 INFO juju.state opening state; mongo addresses: ["localhost:58232"]; entity ""
[LOG] 4.01122 INFO juju.state connection established
[LOG] 4.03270 INFO juju.state initializing environment
[LOG] 4.05312 INFO juju state/api: listening on "127.0.0.1:39861"
[LOG] 4.06976 INFO juju.state opening state; mongo addresses: ["localhost:58232"]; entity ""
[LOG] 4.07689 INFO juju.state connection established
[LOG] 4.08840 INFO juju juju: authorization error while connecting to state server; retrying
[LOG] 4.08845 INFO juju.state opening state; mongo addresses: ["localhost:58232"]; entity ""
[LOG] 4.09325 INFO juju.state connection established
[LOG] 4.12684 INFO juju state/api: dialing "wss://127.0.0.1:39861/"
[LOG] 4.14101 INFO juju state/api: connection established
[LOG] 4.14144 DEBUG juju rpc/jsoncodec: <- {"RequestId":1,"Type":"Admin","Request":"Login","Params":{"AuthTag":"user-admin","Password":"dummy-secret","Nonce":""}}
[LOG] 4.14238 DEBUG juju rpc/jsoncodec: -> {"RequestId":1,"Response":{}}
[LOG] 4.14294 INFO juju.container.lxc lxcObjectFactory replaced with mock lxc factory
[LOG] 4.14513 DEBUG juju rpc/jsoncodec: <- {"RequestId":2,"Type":"Pinger","Request":"Ping","Params":{}}
[LOG] 4.14529 DEBUG juju rpc/jsoncodec: -> {"RequestId":2,"Response":{}}
[LOG] 4.24869 INFO juju machine agent machine-0 start
[LOG] 4.26240 INFO juju Starting StateWorker for machine-0
[LOG] 4.26244 INFO juju worker: start "state"
[LOG] 4.26246 INFO juju.state opening state; mongo addresses: ["localhost:58232"]; entity "machine-0"
[LOG] 4.26273 INFO juju worker: start "api"
[LOG] 4.26294 INFO juju state/api: dialing "wss://localhost:43761/"
[LOG] 4.26359 ERROR juju stat...

=== modified file 'provider/azure/config.go'
--- provider/azure/config.go	2013-08-26 23:13:31 +0000
+++ provider/azure/config.go	2013-09-02 06:17:53 +0000
@@ -147,9 +147,8 @@
   # Pick a simplestreams stream to select OS images from: daily or released
   # images, or any other stream available on simplestreams.  Leave blank for
   # released images.
-  # For now, during development, only the daily 13.10 pre-release images work.
-  image-stream: daily
-  default-series: saucy
+  # image-stream: ""
+  # default-series: precise
 `
 
 func (prov azureEnvironProvider) BoilerplateConfig() string {