jjb
/
jenkins-job-builder
Code Issues Proposed changes

Merge "bug/2002053 allow None for auth-token"

This commit is contained in:
Zuul 2018-05-20 13:33:47 +00:00 committed by Gerrit Code Review
parent a77d29dcd5 0f45ba0351
commit 5aa4f1a9d9
7 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jenkins_jobs/modules/general.py
View File

@ -155,8 +155,9 @@ class General(jenkins_jobs.modules.base.Base):
else:
XML.SubElement(xml,
'blockBuildWhenUpstreamBuilding').text = 'false'
if 'auth-token' in data:
XML.SubElement(xml, 'authToken').text = data['auth-token']
authtoken = data.get('auth-token', None)
if authtoken is not None:
XML.SubElement(xml, 'authToken').text = authtoken
if data.get('concurrent'):
XML.SubElement(xml, 'concurrentBuild').text = 'true'
else:

9
tests/general/fixtures/authtoken001.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<project>
<actions/>
<keepDependencies>false</keepDependencies>
<blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
<blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
<concurrentBuild>false</concurrentBuild>
<canRoam>true</canRoam>
</project>

2
tests/general/fixtures/authtoken001.yaml Normal file
View File

@ -0,0 +1,2 @@
project-type: freestyle
auth-token:

10
tests/general/fixtures/authtoken002.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<project>
<actions/>
<keepDependencies>false</keepDependencies>
<blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
<blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
<authToken>testvalue</authToken>
<concurrentBuild>false</concurrentBuild>
<canRoam>true</canRoam>
</project>

2
tests/general/fixtures/authtoken002.yaml Normal file
View File

@ -0,0 +1,2 @@
project-type: freestyle
auth-token: 'testvalue'

10
tests/general/fixtures/authtoken003.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<project>
<actions/>
<keepDependencies>false</keepDependencies>
<blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
<blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
<authToken/>
<concurrentBuild>false</concurrentBuild>
<canRoam>true</canRoam>
</project>

2
tests/general/fixtures/authtoken003.yaml Normal file
View File

@ -0,0 +1,2 @@
project-type: freestyle
auth-token: ''