Merge lp:~sinzui/juju-ci-tools/yaketty-deps into lp:juju-ci-tools

[Curtis Hovey]

Update apt dep rules for juju-ci-tools

Some packages are now recommends because note every OS has the package
1. Yakkety does not have juju-quickstart. We only test juju-quickstart on the trusty host.
2. juju-local may disappear soon because the juju2 package does not use it.
3. juju-deployer may disappear when juju improves...it won a reprieve in xenial.

Python-pip is already listed in the expects file. We don't need to install it twice

[Christopher Lee (veebers)]

LGTM.

review: Approve

=== modified file 'Makefile'
--- Makefile	2016-06-20 20:41:12 +0000
+++ Makefile	2016-06-27 15:31:10 +0000
@@ -16,8 +16,6 @@
 install-deps: juju-ci-tools.common_0.1.1-0_all.deb apt-update
 	sudo dpkg -i juju-ci-tools.common_0.1.1-0_all.deb || true
 	sudo apt-get install -y -f
-	sudo apt-get install -y juju-local juju juju-quickstart juju-deployer
-	sudo apt-get install -y python-pip
 	./pipdeps.py install
 name=NAMEHERE
 assess_file=assess_$(name).py

=== modified file 'juju-ci-tools-common'
--- juju-ci-tools-common	2016-06-22 15:05:53 +0000
+++ juju-ci-tools-common	2016-06-27 15:31:10 +0000
@@ -7,6 +7,7 @@
 Depends: charm,
          distro-info-data,
          euca2ools,
+         juju,
          python-boto,
          python-coverage,
          python-fixtures,
@@ -22,6 +23,9 @@
          simplestreams,
          uvtool,
          uvtool-libvirt
+Recommends: juju-quickstart,
+            juju-deployer,
+            juju-local
 Architecture: all
 Description: juju-ci-tools-common
  A metapackage providing the dependencies for juju-reports