Merge lp:~abentley/charms/precise/juju-reports/full-path-ini into lp:~juju-qa/charms/precise/juju-reports/trunk

[Aaron Bentley]

Always use the production.ini in the project root. Otherwise, scripts invoked from the crontab will use /lib/python2.7/site-packages/jujureports-0.0-py2.7.egg/production.ini

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'hooks/common.py'
--- hooks/common.py	2014-05-09 16:18:57 +0000
+++ hooks/common.py	2014-05-12 16:11:25 +0000
@@ -54,7 +54,7 @@
 
 def call_script(script_path):
     env = os.environ.copy()
-    ini = os.path.join(PROJECT_DIR, INI)
+    ini = get_ini_path()
     env['HOME'] = HOME
     env['INI'] = ini
     subprocess.check_call([script_path], env=env, cwd=PROJECT_DIR)
 
=== modified file 'templates/crontab.tmpl'
--- templates/crontab.tmpl	2014-05-07 16:03:20 +0000
+++ templates/crontab.tmpl	2014-05-12 16:11:25 +0000
@@ -2,9 +2,9 @@
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 $error_email
 
-*/$interval * * * * ubuntu INI=production.ini $reports_home/bin/python $reports_home/jujureports/jobs/jujuci.py
-*/$interval * * * * ubuntu INI=production.ini $reports_home/bin/python $reports_home/jujureports/jobs/charm_testing.py
+*/$interval * * * * ubuntu INI=$reports_home/production.ini $reports_home/bin/python $reports_home/jujureports/jobs/jujuci.py
+*/$interval * * * * ubuntu INI=$reports_home/production.ini $reports_home/bin/python $reports_home/jujureports/jobs/charm_testing.py
 # The weekday below should match the value scorecard.collection_day
 # in the file production.ini in lp:juju-reports.
-0 16 * * 0 ubuntu INI=production.ini $reports_home/bin/python $reports_home/jujureports/jobs/scorecard.py
+0 16 * * 0 ubuntu INI=$reports_home/production.ini $reports_home/bin/python $reports_home/jujureports/jobs/scorecard.py
 #0 0 * * 1 ubuntu INI=production.ini $reports_home/bin/python $reports_home/jujureports/jobs/cabs.py