juju-core

Merge lp:~axwalk/juju-core/lp1296739-local-sudo-env into lp:~go-bot/juju-core/trunk

  1. lp1296739-local-sudo-env
  2. Merge into trunk
Proposed by Andrew Wilkins
Status: Merged
Approved by: Andrew Wilkins
Approved revision: no longer in the source branch.
Merged at revision: 2471
Proposed branch: lp:~axwalk/juju-core/lp1296739-local-sudo-env
Merge into: lp:~go-bot/juju-core/trunk
Diff against target: 24 lines (+2/-1)
2 files modified
provider/local/environ.go (+1/-1)
provider/local/environ_test.go (+1/-0)
To merge this branch: bzr merge lp:~axwalk/juju-core/lp1296739-local-sudo-env
Reviewer Review Type Date Requested Status
Juju Engineering Pending
Review via email: mp+212538@code.launchpad.net

Commit message

provider/local: use "env" to propagate JUJU_HOME

Sudo may not allow environment variables to be
set directly, so we must use "env" to set JUJU_HOME
when re-executing juju as root.

Fixes lp:1296739

https://codereview.appspot.com/79620043/

Description of the change

provider/local: use "env" to propagate JUJU_HOME

Sudo may not allow environment variables to be
set directly, so we must use "env" to set JUJU_HOME
when re-executing juju as root.

Fixes lp:1296739

https://codereview.appspot.com/79620043/

To post a comment you must log in.
Revision history for this message
Andrew Wilkins (axwalk) wrote :

Reviewers: mp+212538_code.launchpad.net,

Message:
Please take a look.

Description:
provider/local: use "env" to propagate JUJU_HOME

Sudo may not allow environment variables to be
set directly, so we must use "env" to set JUJU_HOME
when re-executing juju as root.

Fixes lp:1296739

https://code.launchpad.net/~axwalk/juju-core/lp1296739-local-sudo-env/+merge/212538

(do not edit description out of merge proposal)

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

Affected files (+4, -1 lines):
   A [revision details]
   M provider/local/environ.go
   M provider/local/environ_test.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-20140324200845-j6jqyuz0uwfvu29o
+New revision: <email address hidden>

Index: provider/local/environ.go
=== modified file 'provider/local/environ.go'
--- provider/local/environ.go 2014-03-24 04:05:24 +0000
+++ provider/local/environ.go 2014-03-25 02:46:17 +0000
@@ -406,7 +406,7 @@
     return err
    }
    args := []string{
- osenv.JujuHomeEnvKey + "=" + osenv.JujuHome(),
+ "env", osenv.JujuHomeEnvKey + "=" + osenv.JujuHome(),
     juju, "destroy-environment", "-y", "--force", env.Name(),
    }
    cmd := exec.Command("sudo", args...)

Index: provider/local/environ_test.go
=== modified file 'provider/local/environ_test.go'
--- provider/local/environ_test.go 2014-03-24 04:05:24 +0000
+++ provider/local/environ_test.go 2014-03-25 02:46:17 +0000
@@ -206,6 +206,7 @@
   c.Assert(err, gc.IsNil)
   expected := []string{
    s.fakesudo,
+ "env",
    "JUJU_HOME=" + osenv.JujuHome(),
    os.Args[0],
    "destroy-environment",

Revision history for this message
Tim Penhey (thumper) wrote :

On 2014/03/25 02:53:32, axw wrote:
> Please take a look.

LGTM

https://codereview.appspot.com/79620043/

Revision history for this message
Go Bot (go-bot) wrote :
Download full text (10.1 KiB)

The attempt to merge lp:~axwalk/juju-core/lp1296739-local-sudo-env into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core 0.014s
ok launchpad.net/juju-core/agent 1.098s
ok launchpad.net/juju-core/agent/mongo 0.520s
ok launchpad.net/juju-core/agent/tools 0.221s
ok launchpad.net/juju-core/bzr 5.076s
ok launchpad.net/juju-core/cert 3.069s
ok launchpad.net/juju-core/charm 0.426s
? 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.035s
ok launchpad.net/juju-core/cloudinit/sshinit 0.836s
ok launchpad.net/juju-core/cmd 0.166s
ok launchpad.net/juju-core/cmd/charm-admin 0.704s
? 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 198.243s
ok launchpad.net/juju-core/cmd/jujud 64.401s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 8.628s
? launchpad.net/juju-core/cmd/plugins/juju-restore [no test files]
ok launchpad.net/juju-core/cmd/plugins/local 0.232s
? launchpad.net/juju-core/cmd/plugins/local/juju-local [no test files]
ok launchpad.net/juju-core/constraints 0.033s
ok launchpad.net/juju-core/container 0.050s
ok launchpad.net/juju-core/container/factory 0.048s
ok launchpad.net/juju-core/container/kvm 0.205s
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 3.341s
? 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.234s
ok launchpad.net/juju-core/environs 2.789s
ok launchpad.net/juju-core/environs/bootstrap 10.528s
ok launchpad.net/juju-core/environs/cloudinit 0.460s
ok launchpad.net/juju-core/environs/config 2.232s
ok launchpad.net/juju-core/environs/configstore 0.029s
ok launchpad.net/juju-core/environs/filestorage 0.030s
ok launchpad.net/juju-core/environs/httpstorage 0.718s
ok launchpad.net/juju-core/environs/imagemetadata 0.462s
? launchpad.net/juju-core/environs/imagemetadata/testing [no test files]
ok launchpad.net/juju-core/environs/instances 0.044s
ok launchpad.net/juju-core/environs/jujutest 0.196s
ok launchpad.net/juju-core/environs/manual 14.802s
ok launchpad.net/juju-core/environs/simplestreams 0.287s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 0.880s
ok launchpad.net/juju-core/environs/storage 0.825s
ok launchpad.net/juju-core/environs/sync 43.145s
ok launchpad.net/juju-core/environs/testing 0.117s
ok launchpad.net/juju-core/environs/tools 5.018s
? launchpad.net/juju-core/environs/tools/testing [no test files]
ok launchpad.net/juju-core/errors 0.011s
ok launchpad.net/juju-core/instance 0.017s
? launchpad.net/juju-core/instance/testing [no test files]
ok launchpad.net/juju-core/juju 19.334s
ok launchpad.net/juju-core/juju/arch 0.01...

Revision history for this message
Go Bot (go-bot) wrote :
Download full text (10.7 KiB)

The attempt to merge lp:~axwalk/juju-core/lp1296739-local-sudo-env into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core 0.013s
ok launchpad.net/juju-core/agent 1.040s
ok launchpad.net/juju-core/agent/mongo 0.529s
ok launchpad.net/juju-core/agent/tools 0.231s
ok launchpad.net/juju-core/bzr 5.167s
ok launchpad.net/juju-core/cert 3.266s
ok launchpad.net/juju-core/charm 0.453s
? 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.748s
ok launchpad.net/juju-core/cmd 0.161s
ok launchpad.net/juju-core/cmd/charm-admin 0.774s
? 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 200.359s
ok launchpad.net/juju-core/cmd/jujud 65.099s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 11.174s
? launchpad.net/juju-core/cmd/plugins/juju-restore [no test files]
ok launchpad.net/juju-core/cmd/plugins/local 0.197s
? launchpad.net/juju-core/cmd/plugins/local/juju-local [no test files]
ok launchpad.net/juju-core/constraints 0.028s
ok launchpad.net/juju-core/container 0.050s
ok launchpad.net/juju-core/container/factory 0.052s
ok launchpad.net/juju-core/container/kvm 0.203s
ok launchpad.net/juju-core/container/kvm/mock 0.037s
? launchpad.net/juju-core/container/kvm/testing [no test files]
ok launchpad.net/juju-core/container/lxc 4.353s
? 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.280s
ok launchpad.net/juju-core/environs 2.408s
ok launchpad.net/juju-core/environs/bootstrap 10.189s
ok launchpad.net/juju-core/environs/cloudinit 0.475s
ok launchpad.net/juju-core/environs/config 2.706s
ok launchpad.net/juju-core/environs/configstore 0.030s
ok launchpad.net/juju-core/environs/filestorage 0.027s
ok launchpad.net/juju-core/environs/httpstorage 0.651s
ok launchpad.net/juju-core/environs/imagemetadata 0.463s
? launchpad.net/juju-core/environs/imagemetadata/testing [no test files]
ok launchpad.net/juju-core/environs/instances 0.043s
ok launchpad.net/juju-core/environs/jujutest 0.173s
ok launchpad.net/juju-core/environs/manual 10.556s
ok launchpad.net/juju-core/environs/simplestreams 0.252s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]

----------------------------------------------------------------------
FAIL: storage_test.go:170: storageSuite.TestWriteFailure

[LOG] 63.33612 DEBUG juju.utils.ssh running: ssh -o "StrictHostKeyChecking no" -o "PasswordAuthentication no" "example.com" 'true'
[LOG] 63.34126 DEBUG juju.utils.ssh running: ssh -o "StrictHostKeyChecking no" -o "PasswordAuthentication no" "example.com" 'head -n 1 > /dev/null; exec 0<&-; echo JUJU-RC: 0; echo blah blah; echo more'
[LOG] 63.34597 DEBUG juju.environs.sshstorage putting "whatever" (len 0) to storage
[LOG] 63.34735 DEB...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'provider/local/environ.go'
2--- provider/local/environ.go 2014-03-24 04:05:24 +0000
3+++ provider/local/environ.go 2014-03-25 02:58:25 +0000
4@@ -406,7 +406,7 @@
5 return err
6 }
7 args := []string{
8- osenv.JujuHomeEnvKey + "=" + osenv.JujuHome(),
9+ "env", osenv.JujuHomeEnvKey + "=" + osenv.JujuHome(),
10 juju, "destroy-environment", "-y", "--force", env.Name(),
11 }
12 cmd := exec.Command("sudo", args...)
13
14=== modified file 'provider/local/environ_test.go'
15--- provider/local/environ_test.go 2014-03-24 04:05:24 +0000
16+++ provider/local/environ_test.go 2014-03-25 02:58:25 +0000
17@@ -206,6 +206,7 @@
18 c.Assert(err, gc.IsNil)
19 expected := []string{
20 s.fakesudo,
21+ "env",
22 "JUJU_HOME=" + osenv.JujuHome(),
23 os.Args[0],
24 "destroy-environment",

Subscribers

People subscribed via source and target branches

to status/vote changes: