Merge "Move project matrix documentation into a test."
This commit is contained in:
commit
845e99372f
|
@ -61,60 +61,10 @@ Example:
|
|||
|
||||
Requires the Jenkins :jenkins-wiki:`ShiningPanda Plugin <ShiningPanda+Plugin>`.
|
||||
|
||||
Example::
|
||||
Example:
|
||||
|
||||
- job:
|
||||
name: matrix-test
|
||||
project-type: matrix
|
||||
execution-strategy:
|
||||
combination-filter: |
|
||||
!(os=="fedora11" && arch=="amd64")
|
||||
sequential: true
|
||||
touchstone:
|
||||
expr: 'os == "fedora11"'
|
||||
result: unstable
|
||||
axes:
|
||||
- axis:
|
||||
type: label-expression
|
||||
name: os
|
||||
values:
|
||||
- ubuntu12.04
|
||||
- fedora11
|
||||
- axis:
|
||||
type: label-expression
|
||||
name: arch
|
||||
values:
|
||||
- amd64
|
||||
- i386
|
||||
- axis:
|
||||
type: slave
|
||||
name: nodes
|
||||
values:
|
||||
- node1
|
||||
- node2
|
||||
- axis:
|
||||
type: dynamic
|
||||
name: config
|
||||
values:
|
||||
- config_list
|
||||
builders:
|
||||
- shell: make && make check
|
||||
|
||||
Example using user-defined axis::
|
||||
|
||||
- job:
|
||||
name: matrix-user-defined
|
||||
project-type: matrix
|
||||
axes:
|
||||
- axis:
|
||||
type: user-defined
|
||||
name: database
|
||||
values:
|
||||
- mysql
|
||||
- postgresql
|
||||
- sqlite
|
||||
builders:
|
||||
- shell: make "$database"
|
||||
.. literalinclude:: /../../tests/yamlparser/fixtures/project-matrix001.yaml
|
||||
:language: yaml
|
||||
|
||||
"""
|
||||
|
||||
|
|
|
@ -0,0 +1,70 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<matrix-project>
|
||||
<executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
|
||||
<runSequentially>true</runSequentially>
|
||||
<touchStoneCombinationFilter>os == "fedora11"</touchStoneCombinationFilter>
|
||||
<touchStoneResultCondition>
|
||||
<name>UNSTABLE</name>
|
||||
<ordinal>1</ordinal>
|
||||
<color>YELLOW</color>
|
||||
</touchStoneResultCondition>
|
||||
</executionStrategy>
|
||||
<combinationFilter>!(os=="fedora11" && arch=="amd64")</combinationFilter>
|
||||
<axes>
|
||||
<hudson.matrix.LabelExpAxis>
|
||||
<name>os</name>
|
||||
<values>
|
||||
<string>ubuntu12.04</string>
|
||||
<string>fedora11</string>
|
||||
</values>
|
||||
</hudson.matrix.LabelExpAxis>
|
||||
<hudson.matrix.LabelExpAxis>
|
||||
<name>arch</name>
|
||||
<values>
|
||||
<string>amd64</string>
|
||||
<string>i386</string>
|
||||
</values>
|
||||
</hudson.matrix.LabelExpAxis>
|
||||
<hudson.matrix.LabelAxis>
|
||||
<name>nodes</name>
|
||||
<values>
|
||||
<string>node1</string>
|
||||
<string>node2</string>
|
||||
</values>
|
||||
</hudson.matrix.LabelAxis>
|
||||
<ca.silvermaplesolutions.jenkins.plugins.daxis.DynamicAxis>
|
||||
<name>config</name>
|
||||
<values>
|
||||
<string>config_list</string>
|
||||
</values>
|
||||
<varName>config_list</varName>
|
||||
<axisValues>
|
||||
<string>default</string>
|
||||
</axisValues>
|
||||
</ca.silvermaplesolutions.jenkins.plugins.daxis.DynamicAxis>
|
||||
<hudson.matrix.TextAxis>
|
||||
<name>database</name>
|
||||
<values>
|
||||
<string>mysql</string>
|
||||
<string>postgresql</string>
|
||||
<string>sqlite</string>
|
||||
</values>
|
||||
</hudson.matrix.TextAxis>
|
||||
</axes>
|
||||
<actions/>
|
||||
<description><!-- Managed by Jenkins Job Builder --></description>
|
||||
<keepDependencies>false</keepDependencies>
|
||||
<blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
|
||||
<blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
|
||||
<concurrentBuild>false</concurrentBuild>
|
||||
<canRoam>true</canRoam>
|
||||
<properties/>
|
||||
<scm class="hudson.scm.NullSCM"/>
|
||||
<builders>
|
||||
<hudson.tasks.Shell>
|
||||
<command>make && make check</command>
|
||||
</hudson.tasks.Shell>
|
||||
</builders>
|
||||
<publishers/>
|
||||
<buildWrappers/>
|
||||
</matrix-project>
|
|
@ -0,0 +1,43 @@
|
|||
- job:
|
||||
name: matrix-test
|
||||
project-type: matrix
|
||||
execution-strategy:
|
||||
combination-filter: |
|
||||
!(os=="fedora11" && arch=="amd64")
|
||||
sequential: true
|
||||
touchstone:
|
||||
expr: 'os == "fedora11"'
|
||||
result: unstable
|
||||
axes:
|
||||
- axis:
|
||||
type: label-expression
|
||||
name: os
|
||||
values:
|
||||
- ubuntu12.04
|
||||
- fedora11
|
||||
- axis:
|
||||
type: label-expression
|
||||
name: arch
|
||||
values:
|
||||
- amd64
|
||||
- i386
|
||||
- axis:
|
||||
type: slave
|
||||
name: nodes
|
||||
values:
|
||||
- node1
|
||||
- node2
|
||||
- axis:
|
||||
type: dynamic
|
||||
name: config
|
||||
values:
|
||||
- config_list
|
||||
- axis:
|
||||
type: user-defined
|
||||
name: database
|
||||
values:
|
||||
- mysql
|
||||
- postgresql
|
||||
- sqlite
|
||||
builders:
|
||||
- shell: make && make check
|
Loading…
Reference in New Issue