diff options
Diffstat (limited to 'tests/yamlparser')
11 files changed, 73 insertions, 78 deletions
diff --git a/tests/yamlparser/fixtures/project_pipeline_concurrent.xml b/tests/yamlparser/fixtures/project_pipeline_concurrent.xml new file mode 100644 index 00000000..d94b5b7f --- /dev/null +++ b/tests/yamlparser/fixtures/project_pipeline_concurrent.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<flow-definition plugin="workflow-job"> + <definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps"> + <script>build job: "job1" +</script> + <sandbox>false</sandbox> + </definition> + <actions/> + <description><!-- Managed by Jenkins Job Builder --></description> + <keepDependencies>false</keepDependencies> + <properties/> +</flow-definition> diff --git a/tests/yamlparser/fixtures/project_pipeline_concurrent.yaml b/tests/yamlparser/fixtures/project_pipeline_concurrent.yaml new file mode 100644 index 00000000..410ca4e4 --- /dev/null +++ b/tests/yamlparser/fixtures/project_pipeline_concurrent.yaml @@ -0,0 +1,6 @@ +- job: + name: test_job + project-type: pipeline + dsl: | + build job: "job1" + concurrent: true diff --git a/tests/yamlparser/fixtures/project_pipeline_template001.xml b/tests/yamlparser/fixtures/project_pipeline_template001.xml index f82dbe50..1921a332 100644 --- a/tests/yamlparser/fixtures/project_pipeline_template001.xml +++ b/tests/yamlparser/fixtures/project_pipeline_template001.xml @@ -14,12 +14,7 @@ parallel [ <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"/> - <publishers/> - <buildWrappers/> + <properties> + <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/> + </properties> </flow-definition> diff --git a/tests/yamlparser/fixtures/project_pipeline_template002.xml b/tests/yamlparser/fixtures/project_pipeline_template002.xml index f92286df..82b941f0 100644 --- a/tests/yamlparser/fixtures/project_pipeline_template002.xml +++ b/tests/yamlparser/fixtures/project_pipeline_template002.xml @@ -14,12 +14,7 @@ parallel [ <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"/> - <publishers/> - <buildWrappers/> + <properties> + <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/> + </properties> </flow-definition> diff --git a/tests/yamlparser/fixtures/project_pipeline_template003.xml b/tests/yamlparser/fixtures/project_pipeline_template003.xml index 8274d6a0..4992c5f9 100644 --- a/tests/yamlparser/fixtures/project_pipeline_template003.xml +++ b/tests/yamlparser/fixtures/project_pipeline_template003.xml @@ -14,12 +14,7 @@ parallel [ <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"/> - <publishers/> - <buildWrappers/> + <properties> + <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/> + </properties> </flow-definition> diff --git a/tests/yamlparser/fixtures/project_pipeline_template004.xml b/tests/yamlparser/fixtures/project_pipeline_template004.xml index cd79ab94..f5a099be 100644 --- a/tests/yamlparser/fixtures/project_pipeline_template004.xml +++ b/tests/yamlparser/fixtures/project_pipeline_template004.xml @@ -16,12 +16,7 @@ <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"/> - <publishers/> - <buildWrappers/> + <properties> + <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/> + </properties> </flow-definition> diff --git a/tests/yamlparser/fixtures/project_pipeline_template005.xml b/tests/yamlparser/fixtures/project_pipeline_template005.xml index 7bafcbfe..65940209 100644 --- a/tests/yamlparser/fixtures/project_pipeline_template005.xml +++ b/tests/yamlparser/fixtures/project_pipeline_template005.xml @@ -13,22 +13,11 @@ <scriptPath>Jenkinsfile</scriptPath> </definition> <actions/> - <description><!-- Managed by Jenkins Job Builder --></description> + <description>maintainer: qa@example.org<!-- 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"/> - <publishers> - <hudson.tasks.Mailer plugin="mailer"> - <recipients>qa@example.org</recipients> - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers/> + <properties> + <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/> + </properties> </flow-definition> <BLANKLINE> <?xml version="1.0" encoding="utf-8"?> @@ -46,20 +35,9 @@ <scriptPath>Jenkinsfile</scriptPath> </definition> <actions/> - <description><!-- Managed by Jenkins Job Builder --></description> + <description>maintainer: dev@example.org<!-- 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"/> - <publishers> - <hudson.tasks.Mailer plugin="mailer"> - <recipients>dev@example.org</recipients> - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - </hudson.tasks.Mailer> - </publishers> - <buildWrappers/> + <properties> + <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/> + </properties> </flow-definition> diff --git a/tests/yamlparser/fixtures/project_pipeline_template005.yaml b/tests/yamlparser/fixtures/project_pipeline_template005.yaml index 851feaf9..3865f019 100644 --- a/tests/yamlparser/fixtures/project_pipeline_template005.yaml +++ b/tests/yamlparser/fixtures/project_pipeline_template005.yaml @@ -12,9 +12,7 @@ scm: - project-scm sandbox: true - publishers: - - email: - recipients: '{mail-to}' + description: 'maintainer: {maintainer}' - job-template: name: '{name}-perf-tests' @@ -23,17 +21,15 @@ scm: - project-scm sandbox: false - publishers: - - email: - recipients: '{mail-to}' + description: 'maintainer: {maintainer}' - job-group: name: '{name}-tests' jobs: - '{name}-unit-tests': - mail-to: dev@example.org + maintainer: dev@example.org - '{name}-perf-tests': - mail-to: qa@example.org + maintainer: qa@example.org - project: name: project-name diff --git a/tests/yamlparser/fixtures/project_pipeline_template006.xml b/tests/yamlparser/fixtures/project_pipeline_template006.xml index 6fdc6522..3db385db 100644 --- a/tests/yamlparser/fixtures/project_pipeline_template006.xml +++ b/tests/yamlparser/fixtures/project_pipeline_template006.xml @@ -10,12 +10,7 @@ <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"/> - <publishers/> - <buildWrappers/> + <properties> + <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/> + </properties> </flow-definition> diff --git a/tests/yamlparser/fixtures/project_pipeline_triggers.xml b/tests/yamlparser/fixtures/project_pipeline_triggers.xml new file mode 100644 index 00000000..ed964de8 --- /dev/null +++ b/tests/yamlparser/fixtures/project_pipeline_triggers.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<flow-definition plugin="workflow-job"> + <definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps"> + <script>build job: "job1" +</script> + <sandbox>false</sandbox> + </definition> + <actions/> + <description><!-- Managed by Jenkins Job Builder --></description> + <keepDependencies>false</keepDependencies> + <properties> + <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/> + <org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty> + <triggers> + <hudson.triggers.TimerTrigger> + <spec>@daily</spec> + </hudson.triggers.TimerTrigger> + </triggers> + </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty> + </properties> +</flow-definition> diff --git a/tests/yamlparser/fixtures/project_pipeline_triggers.yaml b/tests/yamlparser/fixtures/project_pipeline_triggers.yaml new file mode 100644 index 00000000..6021ae01 --- /dev/null +++ b/tests/yamlparser/fixtures/project_pipeline_triggers.yaml @@ -0,0 +1,7 @@ +- job: + name: test_job + project-type: pipeline + dsl: | + build job: "job1" + triggers: + - timed: '@daily' |