summaryrefslogtreecommitdiffstats
path: root/jenkins_jobs/config.py
diff options
context:
space:
mode:
authorSorin Sbarnea <ssbarnea@redhat.com>2018-07-16 16:37:06 +0100
committerThanh Ha <zxiiro@gmail.com>2019-04-16 09:08:05 +0800
commit71f1c89b657491f694095a0bc20828e09bfbc9ca (patch)
treedc05fe53d383b633a0a39ce20c7f11a1bd92587f /jenkins_jobs/config.py
parent1e24fceea191b72bd752df65982498816e0744e5 (diff)
downloadpython-jenkins-job-builder-71f1c89b657491f694095a0bc20828e09bfbc9ca.tar.gz
python-jenkins-job-builder-71f1c89b657491f694095a0bc20828e09bfbc9ca.tar.xz
python-jenkins-job-builder-71f1c89b657491f694095a0bc20828e09bfbc9ca.zip
remove support of old plugin config format
Remove code refering to old plugin config format. Change-Id: Iba0922d3bfe066444e5e982c303968d15e1853a1
Diffstat (limited to 'jenkins_jobs/config.py')
-rw-r--r--jenkins_jobs/config.py17
1 files changed, 2 insertions, 15 deletions
diff --git a/jenkins_jobs/config.py b/jenkins_jobs/config.py
index 9a650101..6f146c19 100644
--- a/jenkins_jobs/config.py
+++ b/jenkins_jobs/config.py
@@ -360,18 +360,5 @@ class JJBConfig(object):
return result
def get_plugin_config(self, plugin, key, default=None):
- value = self.get_module_config('plugin "{}"'.format(plugin), key,
- default)
-
- # Backwards compatibility for users who have not switched to the new
- # plugin configuration format in their config. This code should be
- # removed in future versions of JJB after 2.0.
- if value is default:
- old_value = self.get_module_config(plugin, key, _NOTSET)
- # only log warning if detected a plugin config setting.
- if old_value is not _NOTSET:
- value = old_value
- logger.warning(
- DEPRECATED_PLUGIN_CONFIG_SECTION_MESSAGE.format(
- plugin=plugin))
- return value
+ return self.get_module_config('plugin "{}"'.format(plugin), key,
+ default)