Merge lp:~lutostag/charms/trusty/ci-configurator/trusty-distro-jjb-fix into lp:~matsubara/charms/trusty/ci-configurator/trunk

[Greg Lutostanski]

One fix to fail-fast on run parts.
One fix to not use --flush-cache (because packaged version of jjb in trusty does not have support for that flag)

=== modified file 'hooks/jjb.py'
--- hooks/jjb.py	2015-09-02 21:21:03 +0000
+++ hooks/jjb.py	2016-01-06 15:31:22 +0000
@@ -278,7 +278,7 @@
     # because it comes after a restart, so needs time
     for attempt in range(MAX_RETRIES):
         try:
-            cmd = ['jenkins-jobs', '--flush-cache', 'update', JOBS_CONFIG_DIR]
+            cmd = ['jenkins-jobs', 'update', JOBS_CONFIG_DIR]
             # Run as the CI_USER so the cache will be primed with the correct
             # permissions (rather than root:root).
             common.run_as_user(cmd=cmd, user=common.CI_USER)
@@ -315,7 +315,7 @@
     # run repo setup scripts.
     setupd = os.path.join(common.CI_CONFIG_DIR, 'setup.d')
     if os.path.isdir(setupd):
-        cmd = ["run-parts", setupd]
+        cmd = ["run-parts", "--exit-on-error", setupd]
         log('Running repo setup.')
         subprocess.check_call(cmd)