Merge "Convert jclouds example to unit test"

This commit is contained in:
Jenkins 2016-08-30 03:33:19 +00:00 committed by Gerrit Code Review
commit 6190a2407b
3 changed files with 38 additions and 13 deletions

View File

@ -1075,20 +1075,11 @@ def jclouds(registry, xml_parent, data):
:arg bool stop-on-terminate: Whether or not to suspend instead of terminate
the instance (default false).
Example::
Example:
.. literalinclude:: /../../tests/wrappers/fixtures/jclouds001.yaml
:language: yaml
wrappers:
- jclouds:
single-use: True
instances:
- jenkins-dev-slave:
cloud-name: mycloud1
count: 1
stop-on-terminate: True
- jenkins-test-slave:
cloud-name: mycloud2
count: 2
stop-on-terminate: False
"""
if 'instances' in data:
buildWrapper = XML.SubElement(

View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<project>
<buildWrappers>
<jenkins.plugins.jclouds.compute.JCloudsBuildWrapper>
<instancesToRun>
<jenkins.plugins.jclouds.compute.InstancesToRun>
<templateName>jenkins-dev-slave</templateName>
<cloudName>mycloud1</cloudName>
<count>1</count>
<suspendOrTerminate>true</suspendOrTerminate>
</jenkins.plugins.jclouds.compute.InstancesToRun>
<jenkins.plugins.jclouds.compute.InstancesToRun>
<templateName>jenkins-test-slave</templateName>
<cloudName>mycloud2</cloudName>
<count>2</count>
<suspendOrTerminate>false</suspendOrTerminate>
</jenkins.plugins.jclouds.compute.InstancesToRun>
</instancesToRun>
</jenkins.plugins.jclouds.compute.JCloudsBuildWrapper>
<jenkins.plugins.jclouds.compute.JCloudsOneOffSlave/>
</buildWrappers>
</project>

View File

@ -0,0 +1,12 @@
wrappers:
- jclouds:
single-use: True
instances:
- jenkins-dev-slave:
cloud-name: mycloud1
count: 1
stop-on-terminate: True
- jenkins-test-slave:
cloud-name: mycloud2
count: 2
stop-on-terminate: False