Merge lp:~pwlars/charms/trusty/jenkins/ci-ubiquity-local-install into lp:~canonical-ci-engineering/charms/trusty/jenkins/ubiquity

[Paul Larson]

Bring back Joseph's much better idea of allowing installation of jenkins from a files dir, and also add in plugin installation from there.

[lp:~pwlars/charms/trusty/jenkins/ci-ubiquity-local-install]

52. By Paul Larson on 2015-02-24

add back the ubiquity-branch

[Joe Talbott (joetalbott)]

One minor thing in-line.

review: Needs Fixing

[lp:~pwlars/charms/trusty/jenkins/ci-ubiquity-local-install]

53. By Paul Larson on 2015-02-24

Remove support for url install method

[Paul Larson (pwlars)]

URL removeda

review: Needs Resubmitting

[Joe Talbott (joetalbott)]

review: Approve

=== added file 'README.ubiquity-testing'
--- README.ubiquity-testing	1970-01-01 00:00:00 +0000
+++ README.ubiquity-testing	2015-02-24 15:20:34 +0000
@@ -0,0 +1,6 @@
+To use this with release=local, you'll need to create a files directory 
+with a jenkins .deb you want it to install, and all of the plugins you
+specified for it to install.  The ones I'm using currently can be found
+at:
+jenkins: http://people.canonical.com/~plars/jenkins/
+plugins: http://people.canonical.com/~plars/jenkins/plugins/latest/
 
=== modified file 'config.yaml'
--- config.yaml	2015-02-19 22:29:46 +0000
+++ config.yaml	2015-02-24 15:20:34 +0000
@@ -10,7 +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
+     - local: use the jenkins .deb and plugins in the files/ directory
   username:
     type: string
     default: admin
@@ -43,7 +43,3 @@
     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
 
=== modified file 'deploy.yaml'
--- deploy.yaml	2015-02-20 19:06:40 +0000
+++ deploy.yaml	2015-02-24 15:20:34 +0000
@@ -8,9 +8,5 @@
             options:
                 plugins: parameterized-trigger build-publisher mailer urltrigger next-build-number
                 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
-                plugins-site: http://people.canonical.com/~plars/jenkins/plugins
+                release: local
                 ubiquity-branch: lp:~canonical-ci-engineering/ubiquity/ubiquity-ci-testing
 
=== modified file 'hooks/install'
--- hooks/install	2015-02-19 23:33:34 +0000
+++ hooks/install	2015-02-24 15:20:34 +0000
@@ -2,6 +2,7 @@
 
 set -eu
 
+FILES=$(pwd)/files
 RELEASE=$(config-get release)
 ADMIN_USERNAME=$(config-get username)
 ADMIN_PASSWORD=$(config-get password)
@@ -11,8 +12,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"
+LOCAL="false"
+SOURCE=""
 
 setup_source () {
   # Do something with < Oneiric releases - maybe PPA
@@ -27,13 +28,13 @@
       SOURCE="debian-stable";;
     trunk)
       SOURCE="debian";;
-    url)
-      URL="true";;
+    local)
+      LOCAL="true";;
     *)
       juju-log "release configuration not recognised" && exit 1;;
   esac
 
-  if [ "$URL" != "true" ];  then
+  if [ -n "$SOURCE" ];  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/" \
@@ -50,15 +51,10 @@
 install_jenkins () {
   juju-log "Installing/upgrading jenkins..."
 
-  apt-get -y install -qq default-jre-headless
+  apt-get -y install -qq default-jre-headless daemon
 
-  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
+  if [ "$LOCAL" = "true" ];  then
+      dpkg -i ${FILES}/*.deb
   else
       apt-get -y install -qq jenkins
   fi
@@ -117,7 +113,11 @@
     if [ "$PLUGINS_CHECK_CERT" = "no" ] ; then
       opts="--no-check-certificate"
     fi
-    wget $opts --timestamping $PLUGINS_SITE/latest/$plugin.hpi
+    if [ "$RELEASE" = "local" ]; then
+      cp ${FILES}/$plugin.hpi $plugin_file
+    else
+      wget $opts --timestamping $PLUGINS_SITE/latest/$plugin.hpi
+    fi
     chmod a+r $plugin_file
     rm -f $track_dir/$plugin.hpi
   done