Merge lp:~sinzui/juju-core/run-unit-test-on-trusty into lp:juju-core/1.16

[Curtis Hovey]

Run unit-tests on trusty

Backport the lsb_release check to 1.16 the ensure the right deps are installed
to run unit-tests on trusty.

https://codereview.appspot.com/64000043/

Run unit-tests on trusty

Backport the lsb_release check to 1.16 the ensure the right deps are installed
to run unit-tests on trusty.

https://codereview.appspot.com/64000043/

[Curtis Hovey (sinzui)]

Reviewers: mp+206503_code.launchpad.net,

Message:
Please take a look.

Description:
Run unit-tests on trusty

Backport the lsb_release check to 1.16 the ensure the right deps are
installed
to run unit-tests on trusty.

https://code.launchpad.net/~sinzui/juju-core/run-unit-test-on-trusty/+merge/206503

(do not edit description out of merge proposal)

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

Affected files (+3, -1 lines):
   M Makefile
   A [revision details]

Index: Makefile
=== modified file 'Makefile'
--- Makefile 2013-08-28 17:06:19 +0000
+++ Makefile 2014-02-14 15:01:57 +0000
@@ -67,7 +67,7 @@
  # PPA includes the required mongodb-server binaries. However, neither
  # PPA works on Saucy just yet.
  install-dependencies:
-ifneq ($(shell lsb_release -cs),saucy)
+ifeq ($(shell lsb_release -cs|sed -r 's/precise|quantal|raring/old/'),old)
   @echo Adding juju PPAs for golang and mongodb-server
   @sudo apt-add-repository --yes ppa:juju/golang
   @sudo apt-add-repository --yes ppa:juju/stable

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-20140214091931-m8ep1ib5a45u555c
+New revision: <email address hidden>

[Roger Peppe (rogpeppe)]

On 2014/02/14 15:08:21, curtis wrote:
> Please take a look.

LGTM

https://codereview.appspot.com/64000043/

[Go Bot (go-bot)]

The attempt to merge lp:~sinzui/juju-core/run-unit-test-on-trusty into lp:juju-core/1.16 failed. Below is the output from the failed tests.

ok launchpad.net/juju-core/agent 0.343s
ok launchpad.net/juju-core/agent/tools 0.219s
ok launchpad.net/juju-core/bzr 6.598s
ok launchpad.net/juju-core/cert 3.770s
ok launchpad.net/juju-core/charm 0.574s
? launchpad.net/juju-core/charm/hooks [no test files]
ok launchpad.net/juju-core/cloudinit 0.026s
ok launchpad.net/juju-core/cmd 0.220s
? 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 164.873s
ok launchpad.net/juju-core/cmd/jujud 47.658s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 2.272s
? launchpad.net/juju-core/cmd/plugins/juju-update-bootstrap [no test files]
ok launchpad.net/juju-core/constraints 0.027s
ok launchpad.net/juju-core/container/lxc 0.277s
? launchpad.net/juju-core/container/lxc/mock [no test files]
ok launchpad.net/juju-core/downloader 5.269s
ok launchpad.net/juju-core/environs 3.177s
ok launchpad.net/juju-core/environs/bootstrap 4.937s
ok launchpad.net/juju-core/environs/cloudinit 0.570s
ok launchpad.net/juju-core/environs/config 0.793s
ok launchpad.net/juju-core/environs/configstore 0.040s
ok launchpad.net/juju-core/environs/filestorage 0.035s
ok launchpad.net/juju-core/environs/httpstorage 0.987s
ok launchpad.net/juju-core/environs/imagemetadata 0.455s
ok launchpad.net/juju-core/environs/instances 0.050s
ok launchpad.net/juju-core/environs/jujutest 0.220s
ok launchpad.net/juju-core/environs/manual 4.138s
ok launchpad.net/juju-core/environs/simplestreams 0.326s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 1.062s
ok launchpad.net/juju-core/environs/storage 1.348s
ok launchpad.net/juju-core/environs/sync 28.699s
ok launchpad.net/juju-core/environs/testing 0.212s
ok launchpad.net/juju-core/environs/tools 6.935s
? launchpad.net/juju-core/environs/tools/testing [no test files]
ok launchpad.net/juju-core/errors 0.015s
ok launchpad.net/juju-core/instance 0.022s
? launchpad.net/juju-core/instance/testing [no test files]
ok launchpad.net/juju-core/juju 17.096s
ok launchpad.net/juju-core/juju/osenv 0.041s
? launchpad.net/juju-core/juju/testing [no test files]
ok launchpad.net/juju-core/log 0.015s
ok launchpad.net/juju-core/log/syslog 0.019s
ok launchpad.net/juju-core/names 0.035s
? launchpad.net/juju-core/provider [no test files]
? launchpad.net/juju-core/provider/all [no test files]
ok launchpad.net/juju-core/provider/azure 6.757s
ok launchpad.net/juju-core/provider/common 0.402s
ok launchpad.net/juju-core/provider/dummy 22.527s
ok launchpad.net/juju-core/provider/ec2 5.492s
ok launchpad.net/juju-core/provider/ec2/httpstorage 0.189s
ok launchpad.net/juju-core/provider/local 2.728s
ok launchpad.net/juju-core/provider/maas 11.440s
ok launchpad.net/juju-core/provider/null 1.216s
ok launchpad.net/juju-core/provider/openstack 13.824s
ok launchpad.net/juju-core/rpc 0.077s
ok launchpad.net/juju-core...

[Curtis Hovey (sinzui)]

Hack LGTM

review: Approve (code)

=== modified file 'Makefile'
--- Makefile	2013-08-28 17:06:19 +0000
+++ Makefile	2014-02-14 15:07:26 +0000
@@ -67,7 +67,7 @@
 # PPA includes the required mongodb-server binaries. However, neither
 # PPA works on Saucy just yet.
 install-dependencies:
-ifneq ($(shell lsb_release -cs),saucy)
+ifeq ($(shell lsb_release -cs|sed -r 's/precise|quantal|raring/old/'),old)
 	@echo Adding juju PPAs for golang and mongodb-server
 	@sudo apt-add-repository --yes ppa:juju/golang
 	@sudo apt-add-repository --yes ppa:juju/stable