From a4c1e05f685865774890a14010e4c23422e6a057 Mon Sep 17 00:00:00 2001 From: Antoine Musso Date: Wed, 10 Oct 2012 15:11:10 +0200 Subject: [PATCH] fallback to ./jenkins_job.ini conf When doing developement, we usually want to stick a jenkins_job.ini file at the root of our working directory. The logic still look under /etc/ by default and --conf will override the config file. Test plan: * tox is all green Change-Id: I28781653feb3ce60eb18b50e5b44383d4b544f5a --- jenkins-jobs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jenkins-jobs b/jenkins-jobs index bce401825..be0825501 100755 --- a/jenkins-jobs +++ b/jenkins-jobs @@ -4,6 +4,7 @@ import jenkins_jobs.builder import argparse import ConfigParser import logging +import os import sys @@ -40,10 +41,15 @@ def main(): logging.basicConfig(level=options.log_level) logger = logging.getLogger() + conf = '/etc/jenkins_jobs/jenkins_jobs.ini' if options.conf: conf = options.conf else: - conf = '/etc/jenkins_jobs/jenkins_jobs.ini' + # Fallback to script directory + localconf = os.path.join(os.path.dirname(__file__), + '/jenkins_jobs.ini') + if os.path.isfile(localconf): + conf = localconf if not options.command == 'test': logger.debug("Reading config from {0}".format(conf))