diff options
Diffstat (limited to 'tests')
32 files changed, 244 insertions, 34 deletions
diff --git a/tests/cmd/fixtures/multi-path/output_recursive/job4 b/tests/cmd/fixtures/multi-path/output_recursive/job4 index dd47f962..20f4d7fc 100644 --- a/tests/cmd/fixtures/multi-path/output_recursive/job4 +++ b/tests/cmd/fixtures/multi-path/output_recursive/job4 @@ -3,7 +3,6 @@ <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl"> <runSequentially>false</runSequentially> </executionStrategy> - <combinationFilter/> <axes/> <actions/> <description><!-- Managed by Jenkins Job Builder --></description> diff --git a/tests/general/fixtures/custom-workspace002.xml b/tests/general/fixtures/custom-workspace002.xml index a3a266b6..3535e187 100644 --- a/tests/general/fixtures/custom-workspace002.xml +++ b/tests/general/fixtures/custom-workspace002.xml @@ -3,7 +3,6 @@ <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl"> <runSequentially>false</runSequentially> </executionStrategy> - <combinationFilter/> <axes/> <actions/> <keepDependencies>false</keepDependencies> diff --git a/tests/general/fixtures/matrix-axis-yaml.xml b/tests/general/fixtures/matrix-axis-yaml.xml index 33724b97..02ef44a0 100644 --- a/tests/general/fixtures/matrix-axis-yaml.xml +++ b/tests/general/fixtures/matrix-axis-yaml.xml @@ -3,7 +3,6 @@ <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl"> <runSequentially>false</runSequentially> </executionStrategy> - <combinationFilter/> <axes> <org.jenkinsci.plugins.yamlaxis.YamlAxis> <name>python</name> diff --git a/tests/general/fixtures/matrix-axis001.xml b/tests/general/fixtures/matrix-axis001.xml index da2c6c0d..25929b6b 100644 --- a/tests/general/fixtures/matrix-axis001.xml +++ b/tests/general/fixtures/matrix-axis001.xml @@ -3,7 +3,6 @@ <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl"> <runSequentially>false</runSequentially> </executionStrategy> - <combinationFilter/> <axes> <ca.silvermaplesolutions.jenkins.plugins.daxis.DynamicAxis> <name>config</name> diff --git a/tests/general/fixtures/matrix-axis002.xml b/tests/general/fixtures/matrix-axis002.xml index fa00869b..1f6363bf 100644 --- a/tests/general/fixtures/matrix-axis002.xml +++ b/tests/general/fixtures/matrix-axis002.xml @@ -3,7 +3,6 @@ <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl"> <runSequentially>false</runSequentially> </executionStrategy> - <combinationFilter/> <axes> <ca.silvermaplesolutions.jenkins.plugins.daxis.DynamicAxis> <name>config</name> diff --git a/tests/general/fixtures/matrix-axis003.xml b/tests/general/fixtures/matrix-axis003.xml index 538337cc..1541278d 100644 --- a/tests/general/fixtures/matrix-axis003.xml +++ b/tests/general/fixtures/matrix-axis003.xml @@ -3,7 +3,6 @@ <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl"> <runSequentially>false</runSequentially> </executionStrategy> - <combinationFilter/> <axes> <jenkins.plugins.shiningpanda.matrix.PythonAxis> <name>PYTHON</name> diff --git a/tests/general/fixtures/matrix-axis004.xml b/tests/general/fixtures/matrix-axis004.xml index 1c055910..ce276723 100644 --- a/tests/general/fixtures/matrix-axis004.xml +++ b/tests/general/fixtures/matrix-axis004.xml @@ -3,7 +3,6 @@ <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl"> <runSequentially>false</runSequentially> </executionStrategy> - <combinationFilter/> <axes> <hudson.matrix.JDKAxis> <name>jdk</name> diff --git a/tests/general/fixtures/matrix-axis005.xml b/tests/general/fixtures/matrix-axis005.xml index 69122611..753e4d10 100644 --- a/tests/general/fixtures/matrix-axis005.xml +++ b/tests/general/fixtures/matrix-axis005.xml @@ -3,7 +3,6 @@ <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl"> <runSequentially>false</runSequentially> </executionStrategy> - <combinationFilter/> <axes> <ca.silvermaplesolutions.jenkins.plugins.daxis.DynamicAxis> <name>config</name> diff --git a/tests/general/fixtures/project-type002.xml b/tests/general/fixtures/project-type002.xml index ede8bc0a..ae27ec89 100644 --- a/tests/general/fixtures/project-type002.xml +++ b/tests/general/fixtures/project-type002.xml @@ -3,7 +3,6 @@ <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl"> <runSequentially>false</runSequentially> </executionStrategy> - <combinationFilter/> <axes/> <actions/> <keepDependencies>false</keepDependencies> diff --git a/tests/multibranch/fixtures/multibranch_defaults.xml b/tests/multibranch/fixtures/multibranch_defaults_id_mode.xml index 94859b22..8136ab90 100644 --- a/tests/multibranch/fixtures/multibranch_defaults.xml +++ b/tests/multibranch/fixtures/multibranch_defaults_id_mode.xml @@ -58,6 +58,7 @@ </sources> <factory class="org.jenkinsci.plugins.pipeline.multibranch.defaults.PipelineBranchDefaultsProjectFactory"> <owner class="org.jenkinsci.plugins.pipeline.multibranch.defaults.PipelineMultiBranchDefaultsProject" reference="../.."/> - <scriptPath>Jenkinsfile</scriptPath> + <scriptId>my-pipeline</scriptId> + <useSandbox>true</useSandbox> </factory> </org.jenkinsci.plugins.pipeline.multibranch.defaults.PipelineMultiBranchDefaultsProject> diff --git a/tests/multibranch/fixtures/multibranch_defaults_id_mode.yaml b/tests/multibranch/fixtures/multibranch_defaults_id_mode.yaml new file mode 100644 index 00000000..b7b52f1a --- /dev/null +++ b/tests/multibranch/fixtures/multibranch_defaults_id_mode.yaml @@ -0,0 +1,9 @@ +name: 'demo-multibranch-defaults' +project-type: multibranch-defaults +script-id: my-pipeline +sandbox: true +scm: + - github: + repo: 'foo' + repo-owner: 'johndoe' + credentials-id: 'secret' diff --git a/tests/multibranch/fixtures/multibranch_defaults_path_mode.xml b/tests/multibranch/fixtures/multibranch_defaults_path_mode.xml new file mode 100644 index 00000000..c8a0070e --- /dev/null +++ b/tests/multibranch/fixtures/multibranch_defaults_path_mode.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="utf-8"?> +<org.jenkinsci.plugins.pipeline.multibranch.defaults.PipelineMultiBranchDefaultsProject plugin="workflow-multibranch"> + <properties/> + <views> + <hudson.model.AllView> + <name>All</name> + <filterExecutors>false</filterExecutors> + <filterQueue>false</filterQueue> + <properties class="hudson.model.View$PropertyList"/> + <owner class="org.jenkinsci.plugins.pipeline.multibranch.defaults.PipelineMultiBranchDefaultsProject" reference="../../.."/> + </hudson.model.AllView> + </views> + <viewsTabBar class="hudson.views.DefaultViewsTabBar"/> + <folderViews class="jenkins.branch.MultiBranchProjectViewHolder" plugin="branch-api"> + <owner class="org.jenkinsci.plugins.pipeline.multibranch.defaults.PipelineMultiBranchDefaultsProject" reference="../.."/> + </folderViews> + <healthMetrics> + <com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric plugin="cloudbees-folder"> + <nonRecursive>false</nonRecursive> + </com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric> + </healthMetrics> + <icon class="jenkins.branch.MetadataActionFolderIcon" plugin="branch-api"> + <owner class="org.jenkinsci.plugins.pipeline.multibranch.defaults.PipelineMultiBranchDefaultsProject" reference="../.."/> + </icon> + <orphanedItemStrategy class="com.cloudbees.hudson.plugins.folder.computed.DefaultOrphanedItemStrategy" plugin="cloudbees-folder"> + <pruneDeadBranches>true</pruneDeadBranches> + <daysToKeep>-1</daysToKeep> + <numToKeep>-1</numToKeep> + </orphanedItemStrategy> + <triggers/> + <sources class="jenkins.branch.MultiBranchProject$BranchSourceList" plugin="branch-api"> + <data> + <jenkins.branch.BranchSource> + <source class="org.jenkinsci.plugins.github_branch_source.GitHubSCMSource" plugin="github-branch-source"> + <id>gh-johndoe-foo</id> + <repoOwner>johndoe</repoOwner> + <repository>foo</repository> + <credentialsId>secret</credentialsId> + <traits> + <org.jenkinsci.plugins.github__branch__source.BranchDiscoveryTrait> + <strategyId>1</strategyId> + </org.jenkinsci.plugins.github__branch__source.BranchDiscoveryTrait> + <org.jenkinsci.plugins.github__branch__source.ForkPullRequestDiscoveryTrait> + <strategyId>1</strategyId> + <trust class="org.jenkinsci.plugins.github_branch_source.ForkPullRequestDiscoveryTrait$TrustContributors"/> + </org.jenkinsci.plugins.github__branch__source.ForkPullRequestDiscoveryTrait> + <org.jenkinsci.plugins.github__branch__source.OriginPullRequestDiscoveryTrait> + <strategyId>1</strategyId> + </org.jenkinsci.plugins.github__branch__source.OriginPullRequestDiscoveryTrait> + <jenkins.plugins.git.traits.WipeWorkspaceTrait> + <extension class="hudson.plugins.git.extensions.impl.WipeWorkspace"/> + </jenkins.plugins.git.traits.WipeWorkspaceTrait> + </traits> + </source> + </jenkins.branch.BranchSource> + </data> + <owner class="org.jenkinsci.plugins.pipeline.multibranch.defaults.PipelineMultiBranchDefaultsProject" reference="../.."/> + </sources> + <factory class="org.jenkinsci.plugins.workflow.multibranch.WorkflowBranchProjectFactory" plugin="workflow-multibranch"> + <owner class="org.jenkinsci.plugins.pipeline.multibranch.defaults.PipelineMultiBranchDefaultsProject" reference="../.."/> + <scriptPath>Jenkinsfile</scriptPath> + </factory> +</org.jenkinsci.plugins.pipeline.multibranch.defaults.PipelineMultiBranchDefaultsProject> diff --git a/tests/multibranch/fixtures/multibranch_defaults.yaml b/tests/multibranch/fixtures/multibranch_defaults_path_mode.yaml index 51e41beb..51e41beb 100644 --- a/tests/multibranch/fixtures/multibranch_defaults.yaml +++ b/tests/multibranch/fixtures/multibranch_defaults_path_mode.yaml diff --git a/tests/multibranch/fixtures/scm_github_full.xml b/tests/multibranch/fixtures/scm_github_full.xml index 2d914b2b..6a52b72a 100644 --- a/tests/multibranch/fixtures/scm_github_full.xml +++ b/tests/multibranch/fixtures/scm_github_full.xml @@ -107,6 +107,11 @@ <org.jenkinsci.plugins.workflow.multibranch.DurabilityHintBranchProperty plugin="workflow-multibranch"> <hint>MAX_SURVIVABILITY</hint> </org.jenkinsci.plugins.workflow.multibranch.DurabilityHintBranchProperty> + <com.adobe.jenkins.github__pr__comment__build.TriggerPRCommentBranchProperty plugin="github-pr-comment-build"> + <commentBody>Ci build!</commentBody> + </com.adobe.jenkins.github__pr__comment__build.TriggerPRCommentBranchProperty> + <com.adobe.jenkins.github__pr__comment__build.TriggerPRReviewBranchProperty plugin="github-pr-comment-build"/> + <com.adobe.jenkins.github__pr__comment__build.TriggerPRUpdateBranchProperty plugin="github-pr-comment-build"/> </a> </properties> </strategy> diff --git a/tests/multibranch/fixtures/scm_github_full.yaml b/tests/multibranch/fixtures/scm_github_full.yaml index 42350c67..591e0fd8 100644 --- a/tests/multibranch/fixtures/scm_github_full.yaml +++ b/tests/multibranch/fixtures/scm_github_full.yaml @@ -20,6 +20,9 @@ scm: all-branches: - suppress-scm-triggering: true - pipeline-branch-durability-override: max-survivability + - trigger-build-on-pr-comment: "Ci build!" + - trigger-build-on-pr-review: true + - trigger-build-on-pr-update: true build-strategies: - tags: ignore-tags-newer-than: 1 diff --git a/tests/multibranch/fixtures/scm_github_no_origin_pr_discovery.xml b/tests/multibranch/fixtures/scm_github_no_origin_pr_discovery.xml new file mode 100644 index 00000000..d700a816 --- /dev/null +++ b/tests/multibranch/fixtures/scm_github_no_origin_pr_discovery.xml @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="utf-8"?> +<org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject plugin="workflow-multibranch"> + <properties/> + <views> + <hudson.model.AllView> + <name>All</name> + <filterExecutors>false</filterExecutors> + <filterQueue>false</filterQueue> + <properties class="hudson.model.View$PropertyList"/> + <owner class="org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject" reference="../../.."/> + </hudson.model.AllView> + </views> + <viewsTabBar class="hudson.views.DefaultViewsTabBar"/> + <folderViews class="jenkins.branch.MultiBranchProjectViewHolder" plugin="branch-api"> + <owner class="org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject" reference="../.."/> + </folderViews> + <healthMetrics> + <com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric plugin="cloudbees-folder"> + <nonRecursive>false</nonRecursive> + </com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric> + </healthMetrics> + <icon class="jenkins.branch.MetadataActionFolderIcon" plugin="branch-api"> + <owner class="org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject" reference="../.."/> + </icon> + <orphanedItemStrategy class="com.cloudbees.hudson.plugins.folder.computed.DefaultOrphanedItemStrategy" plugin="cloudbees-folder"> + <pruneDeadBranches>true</pruneDeadBranches> + <daysToKeep>-1</daysToKeep> + <numToKeep>-1</numToKeep> + </orphanedItemStrategy> + <triggers/> + <sources class="jenkins.branch.MultiBranchProject$BranchSourceList" plugin="branch-api"> + <data> + <jenkins.branch.BranchSource> + <source class="org.jenkinsci.plugins.github_branch_source.GitHubSCMSource" plugin="github-branch-source"> + <id>gh-johndoe-foo</id> + <repoOwner>johndoe</repoOwner> + <repository>foo</repository> + <traits> + <org.jenkinsci.plugins.github__branch__source.BranchDiscoveryTrait> + <strategyId>1</strategyId> + </org.jenkinsci.plugins.github__branch__source.BranchDiscoveryTrait> + <org.jenkinsci.plugins.github__branch__source.ForkPullRequestDiscoveryTrait> + <strategyId>1</strategyId> + <trust class="org.jenkinsci.plugins.github_branch_source.ForkPullRequestDiscoveryTrait$TrustContributors"/> + </org.jenkinsci.plugins.github__branch__source.ForkPullRequestDiscoveryTrait> + <jenkins.plugins.git.traits.WipeWorkspaceTrait> + <extension class="hudson.plugins.git.extensions.impl.WipeWorkspace"/> + </jenkins.plugins.git.traits.WipeWorkspaceTrait> + </traits> + </source> + </jenkins.branch.BranchSource> + </data> + <owner class="org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject" reference="../.."/> + </sources> + <factory class="org.jenkinsci.plugins.workflow.multibranch.WorkflowBranchProjectFactory"> + <owner class="org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject" reference="../.."/> + <scriptPath>Jenkinsfile</scriptPath> + </factory> +</org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject> diff --git a/tests/multibranch/fixtures/scm_github_no_origin_pr_discovery.yaml b/tests/multibranch/fixtures/scm_github_no_origin_pr_discovery.yaml new file mode 100644 index 00000000..7852137e --- /dev/null +++ b/tests/multibranch/fixtures/scm_github_no_origin_pr_discovery.yaml @@ -0,0 +1,7 @@ +name: 'demo-multibranch-github-no-fork-prs' +project-type: multibranch +scm: + - github: + repo: 'foo' + repo-owner: 'johndoe' + discover-pr-origin: no diff --git a/tests/publishers/fixtures/join-trigger002.xml b/tests/publishers/fixtures/join-trigger002.xml new file mode 100644 index 00000000..9df79716 --- /dev/null +++ b/tests/publishers/fixtures/join-trigger002.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<project> + <publishers> + <hudson.tasks.BuildTrigger> + <childProjects>project-1,project-2</childProjects> + <threshold> + <name>FAILURE</name> + <ordinal>2</ordinal> + <color>RED</color> + </threshold> + </hudson.tasks.BuildTrigger> + <join.JoinTrigger> + <joinProjects>cleanup</joinProjects> + <joinPublishers/> + <resultThreshold> + <name>FAILURE</name> + <ordinal>2</ordinal> + <color>RED</color> + </resultThreshold> + </join.JoinTrigger> + </publishers> +</project> diff --git a/tests/publishers/fixtures/join-trigger002.yaml b/tests/publishers/fixtures/join-trigger002.yaml new file mode 100644 index 00000000..80940e47 --- /dev/null +++ b/tests/publishers/fixtures/join-trigger002.yaml @@ -0,0 +1,8 @@ +publishers: + - trigger: + project: project-1,project-2 + threshold: failure + - join-trigger: + projects: + - cleanup + threshold: failure diff --git a/tests/triggers/fixtures/github-pull-request-comments.xml b/tests/triggers/fixtures/github-pull-request-comments.xml index 7b2c151e..ef6b231f 100644 --- a/tests/triggers/fixtures/github-pull-request-comments.xml +++ b/tests/triggers/fixtures/github-pull-request-comments.xml @@ -2,25 +2,31 @@ <project> <triggers class="vector"> <org.jenkinsci.plugins.ghprb.GhprbTrigger> + <configVersion>3</configVersion> + <spec>* * * * *</spec> + <cron>* * * * *</cron> <adminlist>user1 user2</adminlist> <whitelist>user3 user4</whitelist> <orgslist>org1 org2</orgslist> + <blackListCommitAuthor/> <whiteListLabels/> <blackListLabels/> <excludedRegions/> <includedRegions/> - <spec>* * * * *</spec> + <buildDescTemplate/> <allowMembersOfWhitelistedOrgsAsAdmin>true</allowMembersOfWhitelistedOrgsAsAdmin> - <cron>* * * * *</cron> <triggerPhrase>retest this please</triggerPhrase> <skipBuildPhrase/> <onlyTriggerPhrase>true</onlyTriggerPhrase> <useGitHubHooks>true</useGitHubHooks> <permitAll>false</permitAll> <autoCloseFailedPullRequests>false</autoCloseFailedPullRequests> + <displayBuildErrorsOnDownstreamBuilds>false</displayBuildErrorsOnDownstreamBuilds> + <whiteListTargetBranches/> + <blackListTargetBranches/> <extensions> <org.jenkinsci.plugins.ghprb.extensions.comments.GhprbBuildStatus> <messages> diff --git a/tests/triggers/fixtures/github-pull-request-full.xml b/tests/triggers/fixtures/github-pull-request-full.xml index 7bfe2e3c..05652ba7 100644 --- a/tests/triggers/fixtures/github-pull-request-full.xml +++ b/tests/triggers/fixtures/github-pull-request-full.xml @@ -2,12 +2,16 @@ <project> <triggers class="vector"> <org.jenkinsci.plugins.ghprb.GhprbTrigger> + <configVersion>3</configVersion> + <spec>* * * * *</spec> + <cron>* * * * *</cron> <adminlist>user1 user2</adminlist> <whitelist>user3 user4</whitelist> <orgslist>org1 org2</orgslist> + <blackListCommitAuthor>blacklist commit author</blackListCommitAuthor> <whiteListLabels>label1 label2</whiteListLabels> <blackListLabels>label3 @@ -17,15 +21,14 @@ region</excludedRegions> <includedRegions>include region</includedRegions> <buildDescTemplate>build description</buildDescTemplate> - <spec>* * * * *</spec> <allowMembersOfWhitelistedOrgsAsAdmin>true</allowMembersOfWhitelistedOrgsAsAdmin> - <cron>* * * * *</cron> <triggerPhrase>retest this please</triggerPhrase> <skipBuildPhrase>no tests</skipBuildPhrase> <onlyTriggerPhrase>true</onlyTriggerPhrase> <useGitHubHooks>true</useGitHubHooks> <permitAll>true</permitAll> <autoCloseFailedPullRequests>false</autoCloseFailedPullRequests> + <displayBuildErrorsOnDownstreamBuilds>true</displayBuildErrorsOnDownstreamBuilds> <whiteListTargetBranches> <org.jenkinsci.plugins.ghprb.GhprbBranch> <branch>master</branch> @@ -49,7 +52,7 @@ region</includedRegions> <triggeredStatus>triggered status message</triggeredStatus> <startedStatus>started</startedStatus> <statusUrl>url/to/status</statusUrl> - <addTestResults>test result with status message</addTestResults> + <addTestResults>false</addTestResults> <completedStatus> <org.jenkinsci.plugins.ghprb.extensions.comments.GhprbBuildResultMessage> <message>success message</message> @@ -82,6 +85,10 @@ region</includedRegions> </messages> </org.jenkinsci.plugins.ghprb.extensions.comments.GhprbBuildStatus> <org.jenkinsci.plugins.ghprb.extensions.build.GhprbCancelBuildsOnUpdate/> + <org.jenkinsci.plugins.ghprb.extensions.comments.GhprbCommentFile> + <commentFilePath>/tmp/path</commentFilePath> + </org.jenkinsci.plugins.ghprb.extensions.comments.GhprbCommentFile> + <org.jenkinsci.plugins.ghprb.extensions.status.GhprbNoCommitStatus/> </extensions> </org.jenkinsci.plugins.ghprb.GhprbTrigger> </triggers> diff --git a/tests/triggers/fixtures/github-pull-request-full.yaml b/tests/triggers/fixtures/github-pull-request-full.yaml index 11a70a36..7fa8bfe9 100644 --- a/tests/triggers/fixtures/github-pull-request-full.yaml +++ b/tests/triggers/fixtures/github-pull-request-full.yaml @@ -19,10 +19,15 @@ triggers: build-desc-template: "build description" trigger-phrase: 'retest this please' skip-build-phrase: 'no tests' + black-list-commit-author: + - blacklist + - commit + - author only-trigger-phrase: true github-hooks: true permit-all: true auto-close-on-fail: false + display-build-errors-on-downstream-builds: true allow-whitelist-orgs-as-admins: true white-list-target-branches: - master @@ -35,7 +40,7 @@ triggers: triggered-status: "triggered status message" started-status: "started" status-url: "url/to/status" - status-add-test-results: "test result with status message" + status-add-test-results: false success-status: "success message" failure-status: "failure message" error-status: "error message" @@ -43,6 +48,8 @@ triggers: failure-comment: "failure comment" error-comment: "error-comment" cancel-builds-on-update: true + comment-file: "/tmp/path" + no-commit-status: true included-regions: - include - region diff --git a/tests/triggers/fixtures/github-pull-request-minimal.xml b/tests/triggers/fixtures/github-pull-request-minimal.xml index dbeac30a..9e72adca 100644 --- a/tests/triggers/fixtures/github-pull-request-minimal.xml +++ b/tests/triggers/fixtures/github-pull-request-minimal.xml @@ -2,22 +2,28 @@ <project> <triggers class="vector"> <org.jenkinsci.plugins.ghprb.GhprbTrigger> + <configVersion>3</configVersion> + <spec/> + <cron/> <adminlist/> <whitelist/> <orgslist/> + <blackListCommitAuthor/> <whiteListLabels/> <blackListLabels/> <excludedRegions/> <includedRegions/> - <spec/> + <buildDescTemplate/> <allowMembersOfWhitelistedOrgsAsAdmin>false</allowMembersOfWhitelistedOrgsAsAdmin> - <cron/> <triggerPhrase/> <skipBuildPhrase/> <onlyTriggerPhrase>false</onlyTriggerPhrase> <useGitHubHooks>false</useGitHubHooks> <permitAll>false</permitAll> <autoCloseFailedPullRequests>false</autoCloseFailedPullRequests> + <displayBuildErrorsOnDownstreamBuilds>false</displayBuildErrorsOnDownstreamBuilds> + <whiteListTargetBranches/> + <blackListTargetBranches/> </org.jenkinsci.plugins.ghprb.GhprbTrigger> </triggers> </project> diff --git a/tests/triggers/fixtures/github-pull-request-multiple-extensions.xml b/tests/triggers/fixtures/github-pull-request-multiple-extensions.xml index f2d8d14b..8d910f0e 100644 --- a/tests/triggers/fixtures/github-pull-request-multiple-extensions.xml +++ b/tests/triggers/fixtures/github-pull-request-multiple-extensions.xml @@ -2,25 +2,31 @@ <project> <triggers class="vector"> <org.jenkinsci.plugins.ghprb.GhprbTrigger> + <configVersion>3</configVersion> + <spec>* * * * *</spec> + <cron>* * * * *</cron> <adminlist>user1 user2</adminlist> <whitelist>user3 user4</whitelist> <orgslist>org1 org2</orgslist> + <blackListCommitAuthor/> <whiteListLabels/> <blackListLabels/> <excludedRegions/> <includedRegions/> - <spec>* * * * *</spec> + <buildDescTemplate/> <allowMembersOfWhitelistedOrgsAsAdmin>true</allowMembersOfWhitelistedOrgsAsAdmin> - <cron>* * * * *</cron> <triggerPhrase>retest this please</triggerPhrase> <skipBuildPhrase/> <onlyTriggerPhrase>true</onlyTriggerPhrase> <useGitHubHooks>true</useGitHubHooks> <permitAll>false</permitAll> <autoCloseFailedPullRequests>false</autoCloseFailedPullRequests> + <displayBuildErrorsOnDownstreamBuilds>false</displayBuildErrorsOnDownstreamBuilds> + <whiteListTargetBranches/> + <blackListTargetBranches/> <extensions> <org.jenkinsci.plugins.ghprb.extensions.status.GhprbSimpleStatus> <commitStatusContext>test status context</commitStatusContext> diff --git a/tests/triggers/fixtures/github-pull-request-status.xml b/tests/triggers/fixtures/github-pull-request-status.xml index c12373cf..758d98b9 100644 --- a/tests/triggers/fixtures/github-pull-request-status.xml +++ b/tests/triggers/fixtures/github-pull-request-status.xml @@ -2,25 +2,31 @@ <project> <triggers class="vector"> <org.jenkinsci.plugins.ghprb.GhprbTrigger> + <configVersion>3</configVersion> + <spec>* * * * *</spec> + <cron>* * * * *</cron> <adminlist>user1 user2</adminlist> <whitelist>user3 user4</whitelist> <orgslist>org1 org2</orgslist> + <blackListCommitAuthor/> <whiteListLabels/> <blackListLabels/> <excludedRegions/> <includedRegions/> - <spec>* * * * *</spec> + <buildDescTemplate/> <allowMembersOfWhitelistedOrgsAsAdmin>true</allowMembersOfWhitelistedOrgsAsAdmin> - <cron>* * * * *</cron> <triggerPhrase>retest this please</triggerPhrase> <skipBuildPhrase/> <onlyTriggerPhrase>true</onlyTriggerPhrase> <useGitHubHooks>true</useGitHubHooks> <permitAll>false</permitAll> <autoCloseFailedPullRequests>false</autoCloseFailedPullRequests> + <displayBuildErrorsOnDownstreamBuilds>false</displayBuildErrorsOnDownstreamBuilds> + <whiteListTargetBranches/> + <blackListTargetBranches/> <extensions> <org.jenkinsci.plugins.ghprb.extensions.status.GhprbSimpleStatus> <commitStatusContext>test status context</commitStatusContext> diff --git a/tests/wrappers/fixtures/matrix-tie-parent.xml b/tests/wrappers/fixtures/matrix-tie-parent.xml index 9d2c65b8..f88d63b5 100644 --- a/tests/wrappers/fixtures/matrix-tie-parent.xml +++ b/tests/wrappers/fixtures/matrix-tie-parent.xml @@ -3,7 +3,6 @@ <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl"> <runSequentially>false</runSequentially> </executionStrategy> - <combinationFilter/> <axes/> <buildWrappers> <matrixtieparent.BuildWrapperMtp> diff --git a/tests/yamlparser/fixtures/custom_distri.xml b/tests/yamlparser/fixtures/custom_distri.xml index a12900d8..cf9e6467 100644 --- a/tests/yamlparser/fixtures/custom_distri.xml +++ b/tests/yamlparser/fixtures/custom_distri.xml @@ -3,7 +3,6 @@ <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl"> <runSequentially>false</runSequentially> </executionStrategy> - <combinationFilter/> <axes> <hudson.matrix.TextAxis> <name>distribution</name> diff --git a/tests/yamlparser/fixtures/expand-yaml-for-template-job/dimensionality-test001.xml b/tests/yamlparser/fixtures/expand-yaml-for-template-job/dimensionality-test001.xml index 8d582dba..0923b125 100644 --- a/tests/yamlparser/fixtures/expand-yaml-for-template-job/dimensionality-test001.xml +++ b/tests/yamlparser/fixtures/expand-yaml-for-template-job/dimensionality-test001.xml @@ -3,7 +3,6 @@ <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl"> <runSequentially>false</runSequentially> </executionStrategy> - <combinationFilter/> <axes> <hudson.matrix.TextAxis> <name>PLATFORM</name> @@ -32,7 +31,6 @@ <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl"> <runSequentially>false</runSequentially> </executionStrategy> - <combinationFilter/> <axes> <hudson.matrix.TextAxis> <name>PLATFORM</name> @@ -61,7 +59,6 @@ <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl"> <runSequentially>false</runSequentially> </executionStrategy> - <combinationFilter/> <axes> <hudson.matrix.TextAxis> <name>PLATFORM</name> diff --git a/tests/yamlparser/fixtures/github_cancel_builds_on_update_variable001.xml b/tests/yamlparser/fixtures/github_cancel_builds_on_update_variable001.xml index 0832d960..b22d1095 100644 --- a/tests/yamlparser/fixtures/github_cancel_builds_on_update_variable001.xml +++ b/tests/yamlparser/fixtures/github_cancel_builds_on_update_variable001.xml @@ -11,22 +11,28 @@ <scm class="hudson.scm.NullSCM"/> <triggers class="vector"> <org.jenkinsci.plugins.ghprb.GhprbTrigger> + <configVersion>3</configVersion> + <spec/> + <cron/> <adminlist/> <whitelist/> <orgslist/> + <blackListCommitAuthor/> <whiteListLabels/> <blackListLabels/> <excludedRegions/> <includedRegions/> - <spec/> + <buildDescTemplate/> <allowMembersOfWhitelistedOrgsAsAdmin>false</allowMembersOfWhitelistedOrgsAsAdmin> - <cron/> <triggerPhrase/> <skipBuildPhrase/> <onlyTriggerPhrase>false</onlyTriggerPhrase> <useGitHubHooks>false</useGitHubHooks> <permitAll>false</permitAll> <autoCloseFailedPullRequests>false</autoCloseFailedPullRequests> + <displayBuildErrorsOnDownstreamBuilds>false</displayBuildErrorsOnDownstreamBuilds> + <whiteListTargetBranches/> + <blackListTargetBranches/> <extensions> <org.jenkinsci.plugins.ghprb.extensions.build.GhprbCancelBuildsOnUpdate/> </extensions> diff --git a/tests/yamlparser/fixtures/github_cancel_builds_on_update_variable002.xml b/tests/yamlparser/fixtures/github_cancel_builds_on_update_variable002.xml index 1d913309..14790269 100644 --- a/tests/yamlparser/fixtures/github_cancel_builds_on_update_variable002.xml +++ b/tests/yamlparser/fixtures/github_cancel_builds_on_update_variable002.xml @@ -11,22 +11,28 @@ <scm class="hudson.scm.NullSCM"/> <triggers class="vector"> <org.jenkinsci.plugins.ghprb.GhprbTrigger> + <configVersion>3</configVersion> + <spec/> + <cron/> <adminlist/> <whitelist/> <orgslist/> + <blackListCommitAuthor/> <whiteListLabels/> <blackListLabels/> <excludedRegions/> <includedRegions/> - <spec/> + <buildDescTemplate/> <allowMembersOfWhitelistedOrgsAsAdmin>false</allowMembersOfWhitelistedOrgsAsAdmin> - <cron/> <triggerPhrase/> <skipBuildPhrase/> <onlyTriggerPhrase>false</onlyTriggerPhrase> <useGitHubHooks>false</useGitHubHooks> <permitAll>false</permitAll> <autoCloseFailedPullRequests>false</autoCloseFailedPullRequests> + <displayBuildErrorsOnDownstreamBuilds>false</displayBuildErrorsOnDownstreamBuilds> + <whiteListTargetBranches/> + <blackListTargetBranches/> </org.jenkinsci.plugins.ghprb.GhprbTrigger> </triggers> <builders/> diff --git a/tests/yamlparser/fixtures/project-matrix002.xml b/tests/yamlparser/fixtures/project-matrix002.xml index a31faada..e9fe8630 100644 --- a/tests/yamlparser/fixtures/project-matrix002.xml +++ b/tests/yamlparser/fixtures/project-matrix002.xml @@ -9,7 +9,6 @@ <color>BLUE</color> </touchStoneResultCondition> </executionStrategy> - <combinationFilter/> <axes/> <actions/> <description><!-- Managed by Jenkins Job Builder --></description> diff --git a/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-003.xml b/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-003.xml index f2bf89fa..18637ea3 100644 --- a/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-003.xml +++ b/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-003.xml @@ -3,7 +3,6 @@ <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl"> <runSequentially>false</runSequentially> </executionStrategy> - <combinationFilter/> <axes> <hudson.matrix.TextAxis> <name>foo_bar</name> @@ -45,7 +44,6 @@ <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl"> <runSequentially>false</runSequentially> </executionStrategy> - <combinationFilter/> <axes> <hudson.matrix.TextAxis> <name>foo_bar</name> |