diff options
| author | David Pursehouse <david.pursehouse@sonymobile.com> | 2014-10-17 18:33:11 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@sonymobile.com> | 2014-10-22 12:26:19 +0800 |
| commit | cfef27280bc5277f96517f6368dfc31d96d6be24 (patch) | |
| tree | 626a331cfb513b7839267519763fed5368398c89 | |
| parent | 9ca0e3c2a6202e3e8151edc13c5d22857aa12612 (diff) | |
| download | python-jenkins-job-builder-cfef27280bc5277f96517f6368dfc31d96d6be24.tar.gz python-jenkins-job-builder-cfef27280bc5277f96517f6368dfc31d96d6be24.tar.xz python-jenkins-job-builder-cfef27280bc5277f96517f6368dfc31d96d6be24.zip | |
Add support for "Override Build Parameters" option in EnvInject
Change-Id: I4f0c9949f1141ccf93ea86d6cdaec6cce7e6ac4d
| -rw-r--r-- | jenkins_jobs/modules/properties.py | 4 | ||||
| -rw-r--r-- | tests/properties/fixtures/inject001.xml | 1 | ||||
| -rw-r--r-- | tests/properties/fixtures/inject002.xml | 1 | ||||
| -rw-r--r-- | tests/properties/fixtures/inject003.xml | 1 | ||||
| -rw-r--r-- | tests/properties/fixtures/inject003.yaml | 1 | ||||
| -rw-r--r-- | tests/yamlparser/fixtures/include-raw-escape001.xml | 1 | ||||
| -rw-r--r-- | tests/yamlparser/fixtures/include-raw001.xml | 1 | ||||
| -rw-r--r-- | tests/yamlparser/fixtures/include-raw002.xml | 1 | ||||
| -rw-r--r-- | tests/yamlparser/fixtures/include001.xml | 1 |
9 files changed, 12 insertions, 0 deletions
diff --git a/jenkins_jobs/modules/properties.py b/jenkins_jobs/modules/properties.py index 29554e32..f8f03a85 100644 --- a/jenkins_jobs/modules/properties.py +++ b/jenkins_jobs/modules/properties.py @@ -226,6 +226,8 @@ def inject(parser, xml_parent, data): :arg bool enabled: injection enabled (default true) :arg bool keep-system-variables: keep system variables (default true) :arg bool keep-build-variables: keep build variable (default true) + :arg bool override-build-parameters: override build parameters + (default false) Example: @@ -256,6 +258,8 @@ def inject(parser, xml_parent, data): data.get('keep-system-variables', True)).lower() XML.SubElement(inject, 'keepBuildVariables').text = str( data.get('keep-build-variables', True)).lower() + XML.SubElement(inject, 'overrideBuildParameters').text = str( + data.get('override-build-parameters', False)).lower() def authenticated_build(parser, xml_parent, data): diff --git a/tests/properties/fixtures/inject001.xml b/tests/properties/fixtures/inject001.xml index 4a8b3f75..ba86a948 100644 --- a/tests/properties/fixtures/inject001.xml +++ b/tests/properties/fixtures/inject001.xml @@ -11,6 +11,7 @@ <on>true</on> <keepJenkinsSystemVariables>true</keepJenkinsSystemVariables> <keepBuildVariables>true</keepBuildVariables> + <overrideBuildParameters>false</overrideBuildParameters> </EnvInjectJobProperty> </properties> </project> diff --git a/tests/properties/fixtures/inject002.xml b/tests/properties/fixtures/inject002.xml index 9a5e12f9..4f5f699d 100644 --- a/tests/properties/fixtures/inject002.xml +++ b/tests/properties/fixtures/inject002.xml @@ -8,6 +8,7 @@ <on>true</on> <keepJenkinsSystemVariables>true</keepJenkinsSystemVariables> <keepBuildVariables>true</keepBuildVariables> + <overrideBuildParameters>false</overrideBuildParameters> </EnvInjectJobProperty> </properties> </project> diff --git a/tests/properties/fixtures/inject003.xml b/tests/properties/fixtures/inject003.xml index 4572543d..03faa054 100644 --- a/tests/properties/fixtures/inject003.xml +++ b/tests/properties/fixtures/inject003.xml @@ -8,6 +8,7 @@ <on>true</on> <keepJenkinsSystemVariables>false</keepJenkinsSystemVariables> <keepBuildVariables>false</keepBuildVariables> + <overrideBuildParameters>true</overrideBuildParameters> </EnvInjectJobProperty> </properties> </project> diff --git a/tests/properties/fixtures/inject003.yaml b/tests/properties/fixtures/inject003.yaml index eb96d0a2..5dc3fbdc 100644 --- a/tests/properties/fixtures/inject003.yaml +++ b/tests/properties/fixtures/inject003.yaml @@ -2,3 +2,4 @@ properties: - inject: keep-build-variables: false keep-system-variables: false + override-build-parameters: true diff --git a/tests/yamlparser/fixtures/include-raw-escape001.xml b/tests/yamlparser/fixtures/include-raw-escape001.xml index f24be4da..060b5cab 100644 --- a/tests/yamlparser/fixtures/include-raw-escape001.xml +++ b/tests/yamlparser/fixtures/include-raw-escape001.xml @@ -18,6 +18,7 @@ <on>true</on> <keepJenkinsSystemVariables>true</keepJenkinsSystemVariables> <keepBuildVariables>true</keepBuildVariables> + <overrideBuildParameters>false</overrideBuildParameters> </EnvInjectJobProperty> </properties> <scm class="hudson.scm.NullSCM"/> diff --git a/tests/yamlparser/fixtures/include-raw001.xml b/tests/yamlparser/fixtures/include-raw001.xml index 9713f14d..688a0bb9 100644 --- a/tests/yamlparser/fixtures/include-raw001.xml +++ b/tests/yamlparser/fixtures/include-raw001.xml @@ -15,6 +15,7 @@ <on>true</on> <keepJenkinsSystemVariables>true</keepJenkinsSystemVariables> <keepBuildVariables>true</keepBuildVariables> + <overrideBuildParameters>false</overrideBuildParameters> </EnvInjectJobProperty> </properties> <scm class="hudson.scm.NullSCM"/> diff --git a/tests/yamlparser/fixtures/include-raw002.xml b/tests/yamlparser/fixtures/include-raw002.xml index 25e97ab3..640c3edb 100644 --- a/tests/yamlparser/fixtures/include-raw002.xml +++ b/tests/yamlparser/fixtures/include-raw002.xml @@ -15,6 +15,7 @@ <on>true</on> <keepJenkinsSystemVariables>true</keepJenkinsSystemVariables> <keepBuildVariables>true</keepBuildVariables> + <overrideBuildParameters>false</overrideBuildParameters> </EnvInjectJobProperty> </properties> <scm class="hudson.scm.NullSCM"/> diff --git a/tests/yamlparser/fixtures/include001.xml b/tests/yamlparser/fixtures/include001.xml index 25e97ab3..640c3edb 100644 --- a/tests/yamlparser/fixtures/include001.xml +++ b/tests/yamlparser/fixtures/include001.xml @@ -15,6 +15,7 @@ <on>true</on> <keepJenkinsSystemVariables>true</keepJenkinsSystemVariables> <keepBuildVariables>true</keepBuildVariables> + <overrideBuildParameters>false</overrideBuildParameters> </EnvInjectJobProperty> </properties> <scm class="hudson.scm.NullSCM"/> |