Merge lp:~joetalbott/charms/trusty/jenkins/add_local_deb into lp:~canonical-ci-engineering/charms/trusty/jenkins/ubiquity

[Joe Talbott]

Add support for deploying a local jenkins debian package.

Add support for deploying a local jenkins debian package.

[lp:~joetalbott/charms/trusty/jenkins/add_local_deb]

45. By Joe Talbott on 2015-02-19

Add support for deploying with a local copy of a jenkins debian package.

46. By Joe Talbott on 2015-02-19

Use a URL for the jenkins deb rather than including the deb itself.

[Paul Larson (pwlars)]

Some minor comments, otherwise looks fine.

review: Approve

[lp:~joetalbott/charms/trusty/jenkins/add_local_deb]

47. By Joe Talbott on 2015-02-19

Minor clean up.

[Paul Larson (pwlars)]

+1

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-02-18 03:46:19 +0000
+++ config.yaml	2015-02-19 23:27:45 +0000
@@ -10,6 +10,7 @@
      Source of Jenkins, options include:
      - lts: use the most recent Jenkins LTS release.
      - trunk: use the most recent Jenkins release.
+     - url: use the url in release-url to fetch a jenkins .deb to install
   username:
     type: string
     default: admin
@@ -42,3 +43,7 @@
     type: string
     default: lp:ubiquity
     description: bzr branch to pull for ubiquity tests
+  release-url:
+    type: string
+    default: http://example.com/jenkins.deb
+    description: Url for jenkins package to install

=== added file 'deploy.yaml'
--- deploy.yaml	1970-01-01 00:00:00 +0000
+++ deploy.yaml	2015-02-19 23:27:45 +0000
@@ -0,0 +1,14 @@
+ubiquity-testing:
+    # Quick test to see if this works
+    series: trusty
+    services:
+        ubiquity-jenkins:
+            charm: local:trusty/jenkins
+            options:
+                plugins: parameterized-trigger build-publisher mailer urltrigger
+                username: admin
+                #if you don't specify, it uses distro - might be what we
+                #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
+                ubiquity-branch: lp:~canonical-ci-engineering/ubiquity/ubiquity-ci-testing

=== added directory 'files'
=== modified file 'hooks/install'
--- hooks/install	2014-04-17 12:35:18 +0000
+++ hooks/install	2015-02-19 23:27:45 +0000
@@ -11,6 +11,8 @@
 REMOVE_UNLISTED_PLUGINS=$(config-get remove-unlisted-plugins)
 CWD=$(dirname $0)
 JENKINS_HOME=/var/lib/jenkins
+RELEASE_URL=$(config-get release-url)
+URL="false"
 
 setup_source () {
   # Do something with < Oneiric releases - maybe PPA
@@ -25,14 +27,19 @@
       SOURCE="debian-stable";;
     trunk)
       SOURCE="debian";;
+    url)
+      URL="true";;
     *)
       juju-log "release configuration not recognised" && exit 1;;
   esac
-  # Setup archive to use appropriate jenkins upstream
-  wget -q -O - http://pkg.jenkins-ci.org/$SOURCE/jenkins-ci.org.key | apt-key add -
-  echo "deb http://pkg.jenkins-ci.org/$SOURCE binary/" \
-      > /etc/apt/sources.list.d/jenkins.list
-  apt-get update || true
+
+  if [ "$URL" != "true" ];  then
+      # Setup archive to use appropriate jenkins upstream
+      wget -q -O - http://pkg.jenkins-ci.org/$SOURCE/jenkins-ci.org.key | apt-key add -
+      echo "deb http://pkg.jenkins-ci.org/$SOURCE binary/" \
+          > /etc/apt/sources.list.d/jenkins.list
+      apt-get update || true
+  fi
 }
 # Only setup the source if jenkins is not already installed
 # this makes the config 'release' immutable - i.e. you 
@@ -42,7 +49,20 @@
 # Install jenkins
 install_jenkins () {
   juju-log "Installing/upgrading jenkins..."
-  apt-get -y install -qq jenkins default-jre-headless
+
+  apt-get -y install -qq default-jre-headless
+
+  if [ "$RELEASE" = "url" ]; then
+      PKG=files/jenkins.deb
+      wget -O $PKG $RELEASE_URL
+      if [ -f $PKG ]; then
+          apt-get -y install -qq daemon
+          dpkg -i $PKG
+      fi
+  else
+      apt-get -y install -qq jenkins
+  fi
+
 }
 # Re-run whenever called to pickup any updates
 install_jenkins