Merge lp:~pwlars/charms/trusty/jenkins/add-plugin-site into lp:~canonical-ci-engineering/charms/trusty/jenkins/ubiquity

[Paul Larson]

We need to also account for the plugins. By default, jenkins charm will try to go out and grab whatever is latest from the external site. For one, we can't reach that from within our environment, but also we want to keep it restricted to a version we've tested. This allows it to be set using the existing config parameter.

[Joe Talbott (joetalbott)]

Nice work!

review: Approve

=== modified file 'deploy.yaml'
--- deploy.yaml	2015-02-19 23:33:34 +0000
+++ deploy.yaml	2015-02-20 04:03:34 +0000
@@ -3,7 +3,8 @@
     series: trusty
     services:
         ubiquity-jenkins:
-            charm: local:trusty/jenkins
+            charm: ubiquity
+            branch: lp:~canonical-ci-engineering/charms/trusty/jenkins/ubiquity
             options:
                 plugins: parameterized-trigger build-publisher mailer urltrigger
                 username: admin
@@ -11,4 +12,5 @@
                 #use for train because we want to use cat instead
                 release: url
                 release-url: http://people.canonical.com/~josepht/jenkins_1.580.2_all.deb
+                plugins-site: http://people.canonical.com/~plars/jenkins/plugins
                 ubiquity-branch: lp:~canonical-ci-engineering/ubiquity/ubiquity-ci-testing