diff options
author | Zuul <zuul@review.openstack.org> | 2018-09-20 14:47:58 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2018-09-20 14:47:59 +0000 |
commit | 494f5d3cc27f5e141d796427138e891592b67e9e (patch) | |
tree | 18aa3f74c63af8fc16adba501affea5995451a67 /tests/multibranch/fixtures | |
parent | 190ddf04803ef67f97bd8a133399075bab8d5d44 (diff) | |
parent | 92f18515b426e231b325cc786c28103fcd932d59 (diff) | |
download | python-jenkins-job-builder-494f5d3cc27f5e141d796427138e891592b67e9e.tar.gz python-jenkins-job-builder-494f5d3cc27f5e141d796427138e891592b67e9e.tar.xz python-jenkins-job-builder-494f5d3cc27f5e141d796427138e891592b67e9e.zip |
Merge "Extend multibranch pipeline project scm"
Diffstat (limited to 'tests/multibranch/fixtures')
-rw-r--r-- | tests/multibranch/fixtures/multi_scm_full.xml | 12 | ||||
-rw-r--r-- | tests/multibranch/fixtures/multibranch_defaults.xml | 3 | ||||
-rw-r--r-- | tests/multibranch/fixtures/scm_bitbucket_full.xml | 38 | ||||
-rw-r--r-- | tests/multibranch/fixtures/scm_bitbucket_full.yaml | 15 | ||||
-rw-r--r-- | tests/multibranch/fixtures/scm_bitbucket_minimal.xml | 6 | ||||
-rw-r--r-- | tests/multibranch/fixtures/scm_git_full.xml | 38 | ||||
-rw-r--r-- | tests/multibranch/fixtures/scm_git_full.yaml | 15 | ||||
-rw-r--r-- | tests/multibranch/fixtures/scm_git_minimal.xml | 3 | ||||
-rw-r--r-- | tests/multibranch/fixtures/scm_github_full.xml | 38 | ||||
-rw-r--r-- | tests/multibranch/fixtures/scm_github_full.yaml | 15 | ||||
-rw-r--r-- | tests/multibranch/fixtures/scm_github_minimal.xml | 3 | ||||
-rw-r--r-- | tests/multibranch/fixtures/scm_github_no_fork_pr_discovery.xml | 3 |
12 files changed, 187 insertions, 2 deletions
diff --git a/tests/multibranch/fixtures/multi_scm_full.xml b/tests/multibranch/fixtures/multi_scm_full.xml index e0af6f3c..f0dd2aed 100644 --- a/tests/multibranch/fixtures/multi_scm_full.xml +++ b/tests/multibranch/fixtures/multi_scm_full.xml @@ -41,7 +41,11 @@ <repoOwner>SANDBOX</repoOwner> <repository>test</repository> <credentialsId>secret</credentialsId> - <traits/> + <traits> + <jenkins.plugins.git.traits.WipeWorkspaceTrait> + <extension class="hudson.plugins.git.extensions.impl.WipeWorkspace"/> + </jenkins.plugins.git.traits.WipeWorkspaceTrait> + </traits> </source> </jenkins.branch.BranchSource> <jenkins.branch.BranchSource> @@ -51,6 +55,9 @@ <credentialsId>secret</credentialsId> <traits> <jenkins.plugins.git.traits.BranchDiscoveryTrait/> + <jenkins.plugins.git.traits.WipeWorkspaceTrait> + <extension class="hudson.plugins.git.extensions.impl.WipeWorkspace"/> + </jenkins.plugins.git.traits.WipeWorkspaceTrait> </traits> </source> </jenkins.branch.BranchSource> @@ -71,6 +78,9 @@ <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> diff --git a/tests/multibranch/fixtures/multibranch_defaults.xml b/tests/multibranch/fixtures/multibranch_defaults.xml index 061f1823..94859b22 100644 --- a/tests/multibranch/fixtures/multibranch_defaults.xml +++ b/tests/multibranch/fixtures/multibranch_defaults.xml @@ -47,6 +47,9 @@ <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> diff --git a/tests/multibranch/fixtures/scm_bitbucket_full.xml b/tests/multibranch/fixtures/scm_bitbucket_full.xml index 3433e393..c7389335 100644 --- a/tests/multibranch/fixtures/scm_bitbucket_full.xml +++ b/tests/multibranch/fixtures/scm_bitbucket_full.xml @@ -64,6 +64,44 @@ <includes>*</includes> <excludes>master</excludes> </jenkins.scm.impl.trait.WildcardSCMHeadFilterTrait> + <jenkins.plugins.git.traits.CleanAfterCheckoutTrait> + <extension class="hudson.plugins.git.extensions.impl.CleanCheckout"/> + </jenkins.plugins.git.traits.CleanAfterCheckoutTrait> + <jenkins.plugins.git.traits.CleanBeforeCheckoutTrait> + <extension class="hudson.plugins.git.extensions.impl.CleanBeforeCheckout"/> + </jenkins.plugins.git.traits.CleanBeforeCheckoutTrait> + <jenkins.plugins.git.traits.CloneOptionTrait> + <extension class="hudson.plugins.git.extensions.impl.CloneOption"> + <shallow>true</shallow> + <depth>3</depth> + <noTags>true</noTags> + <timeout>100</timeout> + </extension> + </jenkins.plugins.git.traits.CloneOptionTrait> + <jenkins.plugins.git.traits.SubmoduleOptionTrait> + <extension class="hudson.plugins.git.extensions.impl.SubmoduleOption"> + <disableSubmodules>false</disableSubmodules> + <recursiveSubmodules>true</recursiveSubmodules> + <trackingSubmodules>false</trackingSubmodules> + <parentCredentials>true</parentCredentials> + <reference/> + <timeout>100</timeout> + </extension> + </jenkins.plugins.git.traits.SubmoduleOptionTrait> + <jenkins.plugins.git.traits.CheckoutOptionTrait> + <extension class="hudson.plugins.git.extensions.impl.CheckoutOption"> + <timeout>100</timeout> + </extension> + </jenkins.plugins.git.traits.CheckoutOptionTrait> + <jenkins.plugins.git.traits.PruneStaleBranchTrait> + <extension class="hudson.plugins.git.extensions.impl.PruneStaleBranch"/> + </jenkins.plugins.git.traits.PruneStaleBranchTrait> + <jenkins.plugins.git.traits.WipeWorkspaceTrait> + <extension class="hudson.plugins.git.extensions.impl.WipeWorkspace"/> + </jenkins.plugins.git.traits.WipeWorkspaceTrait> + <jenkins.plugins.git.traits.AuthorInChangelogTrait> + <extension class="hudson.plugins.git.extensions.impl.AuthorInChangelog"/> + </jenkins.plugins.git.traits.AuthorInChangelogTrait> </traits> </source> <buildStrategies> diff --git a/tests/multibranch/fixtures/scm_bitbucket_full.yaml b/tests/multibranch/fixtures/scm_bitbucket_full.yaml index d9ff9c8c..73c116e0 100644 --- a/tests/multibranch/fixtures/scm_bitbucket_full.yaml +++ b/tests/multibranch/fixtures/scm_bitbucket_full.yaml @@ -42,3 +42,18 @@ scm: - exact-name: {} - regex-name: {} - wildcards-name: {} + clean: + after: true + before: true + prune: true + shallow-clone: true + depth: 3 + do-not-fetch-tags: true + submodule: + disable: false + recursive: true + parent-credentials: true + timeout: 100 + timeout: "100" + use-author: true + wipe-workspace: true diff --git a/tests/multibranch/fixtures/scm_bitbucket_minimal.xml b/tests/multibranch/fixtures/scm_bitbucket_minimal.xml index 24ade1f4..46b124ee 100644 --- a/tests/multibranch/fixtures/scm_bitbucket_minimal.xml +++ b/tests/multibranch/fixtures/scm_bitbucket_minimal.xml @@ -35,7 +35,11 @@ <id>bb-SANDBOX-test</id> <repoOwner>SANDBOX</repoOwner> <repository>test</repository> - <traits/> + <traits> + <jenkins.plugins.git.traits.WipeWorkspaceTrait> + <extension class="hudson.plugins.git.extensions.impl.WipeWorkspace"/> + </jenkins.plugins.git.traits.WipeWorkspaceTrait> + </traits> </source> </jenkins.branch.BranchSource> </data> diff --git a/tests/multibranch/fixtures/scm_git_full.xml b/tests/multibranch/fixtures/scm_git_full.xml index c6dd162b..e5435217 100644 --- a/tests/multibranch/fixtures/scm_git_full.xml +++ b/tests/multibranch/fixtures/scm_git_full.xml @@ -41,6 +41,44 @@ <jenkins.scm.impl.trait.RegexSCMHeadFilterTrait> <regex>master|\d+\.\d+</regex> </jenkins.scm.impl.trait.RegexSCMHeadFilterTrait> + <jenkins.plugins.git.traits.CleanAfterCheckoutTrait> + <extension class="hudson.plugins.git.extensions.impl.CleanCheckout"/> + </jenkins.plugins.git.traits.CleanAfterCheckoutTrait> + <jenkins.plugins.git.traits.CleanBeforeCheckoutTrait> + <extension class="hudson.plugins.git.extensions.impl.CleanBeforeCheckout"/> + </jenkins.plugins.git.traits.CleanBeforeCheckoutTrait> + <jenkins.plugins.git.traits.CloneOptionTrait> + <extension class="hudson.plugins.git.extensions.impl.CloneOption"> + <shallow>true</shallow> + <depth>3</depth> + <noTags>true</noTags> + <timeout>100</timeout> + </extension> + </jenkins.plugins.git.traits.CloneOptionTrait> + <jenkins.plugins.git.traits.SubmoduleOptionTrait> + <extension class="hudson.plugins.git.extensions.impl.SubmoduleOption"> + <disableSubmodules>false</disableSubmodules> + <recursiveSubmodules>true</recursiveSubmodules> + <trackingSubmodules>false</trackingSubmodules> + <parentCredentials>true</parentCredentials> + <reference/> + <timeout>100</timeout> + </extension> + </jenkins.plugins.git.traits.SubmoduleOptionTrait> + <jenkins.plugins.git.traits.CheckoutOptionTrait> + <extension class="hudson.plugins.git.extensions.impl.CheckoutOption"> + <timeout>100</timeout> + </extension> + </jenkins.plugins.git.traits.CheckoutOptionTrait> + <jenkins.plugins.git.traits.PruneStaleBranchTrait> + <extension class="hudson.plugins.git.extensions.impl.PruneStaleBranch"/> + </jenkins.plugins.git.traits.PruneStaleBranchTrait> + <jenkins.plugins.git.traits.WipeWorkspaceTrait> + <extension class="hudson.plugins.git.extensions.impl.WipeWorkspace"/> + </jenkins.plugins.git.traits.WipeWorkspaceTrait> + <jenkins.plugins.git.traits.AuthorInChangelogTrait> + <extension class="hudson.plugins.git.extensions.impl.AuthorInChangelog"/> + </jenkins.plugins.git.traits.AuthorInChangelogTrait> </traits> </source> <buildStrategies> diff --git a/tests/multibranch/fixtures/scm_git_full.yaml b/tests/multibranch/fixtures/scm_git_full.yaml index 3d83c2e4..71a93278 100644 --- a/tests/multibranch/fixtures/scm_git_full.yaml +++ b/tests/multibranch/fixtures/scm_git_full.yaml @@ -32,3 +32,18 @@ scm: - exact-name: {} - regex-name: {} - wildcards-name: {} + clean: + after: true + before: true + prune: true + shallow-clone: true + depth: 3 + do-not-fetch-tags: true + submodule: + disable: false + recursive: true + parent-credentials: true + timeout: 100 + timeout: "100" + use-author: true + wipe-workspace: true diff --git a/tests/multibranch/fixtures/scm_git_minimal.xml b/tests/multibranch/fixtures/scm_git_minimal.xml index 0eff005b..d30a42f9 100644 --- a/tests/multibranch/fixtures/scm_git_minimal.xml +++ b/tests/multibranch/fixtures/scm_git_minimal.xml @@ -37,6 +37,9 @@ <credentialsId/> <traits> <jenkins.plugins.git.traits.BranchDiscoveryTrait/> + <jenkins.plugins.git.traits.WipeWorkspaceTrait> + <extension class="hudson.plugins.git.extensions.impl.WipeWorkspace"/> + </jenkins.plugins.git.traits.WipeWorkspaceTrait> </traits> </source> </jenkins.branch.BranchSource> diff --git a/tests/multibranch/fixtures/scm_github_full.xml b/tests/multibranch/fixtures/scm_github_full.xml index 9786847f..ea8eee0d 100644 --- a/tests/multibranch/fixtures/scm_github_full.xml +++ b/tests/multibranch/fixtures/scm_github_full.xml @@ -50,6 +50,44 @@ <org.jenkinsci.plugins.github__branch__source.OriginPullRequestDiscoveryTrait> <strategyId>3</strategyId> </org.jenkinsci.plugins.github__branch__source.OriginPullRequestDiscoveryTrait> + <jenkins.plugins.git.traits.CleanAfterCheckoutTrait> + <extension class="hudson.plugins.git.extensions.impl.CleanCheckout"/> + </jenkins.plugins.git.traits.CleanAfterCheckoutTrait> + <jenkins.plugins.git.traits.CleanBeforeCheckoutTrait> + <extension class="hudson.plugins.git.extensions.impl.CleanBeforeCheckout"/> + </jenkins.plugins.git.traits.CleanBeforeCheckoutTrait> + <jenkins.plugins.git.traits.CloneOptionTrait> + <extension class="hudson.plugins.git.extensions.impl.CloneOption"> + <shallow>true</shallow> + <depth>3</depth> + <noTags>true</noTags> + <timeout>100</timeout> + </extension> + </jenkins.plugins.git.traits.CloneOptionTrait> + <jenkins.plugins.git.traits.SubmoduleOptionTrait> + <extension class="hudson.plugins.git.extensions.impl.SubmoduleOption"> + <disableSubmodules>false</disableSubmodules> + <recursiveSubmodules>true</recursiveSubmodules> + <trackingSubmodules>false</trackingSubmodules> + <parentCredentials>true</parentCredentials> + <reference/> + <timeout>100</timeout> + </extension> + </jenkins.plugins.git.traits.SubmoduleOptionTrait> + <jenkins.plugins.git.traits.CheckoutOptionTrait> + <extension class="hudson.plugins.git.extensions.impl.CheckoutOption"> + <timeout>100</timeout> + </extension> + </jenkins.plugins.git.traits.CheckoutOptionTrait> + <jenkins.plugins.git.traits.PruneStaleBranchTrait> + <extension class="hudson.plugins.git.extensions.impl.PruneStaleBranch"/> + </jenkins.plugins.git.traits.PruneStaleBranchTrait> + <jenkins.plugins.git.traits.WipeWorkspaceTrait> + <extension class="hudson.plugins.git.extensions.impl.WipeWorkspace"/> + </jenkins.plugins.git.traits.WipeWorkspaceTrait> + <jenkins.plugins.git.traits.AuthorInChangelogTrait> + <extension class="hudson.plugins.git.extensions.impl.AuthorInChangelog"/> + </jenkins.plugins.git.traits.AuthorInChangelogTrait> </traits> </source> <buildStrategies> diff --git a/tests/multibranch/fixtures/scm_github_full.yaml b/tests/multibranch/fixtures/scm_github_full.yaml index 6eb63c62..d94da6fc 100644 --- a/tests/multibranch/fixtures/scm_github_full.yaml +++ b/tests/multibranch/fixtures/scm_github_full.yaml @@ -36,3 +36,18 @@ scm: - exact-name: {} - regex-name: {} - wildcards-name: {} + clean: + after: true + before: true + prune: true + shallow-clone: true + depth: 3 + do-not-fetch-tags: true + submodule: + disable: false + recursive: true + parent-credentials: true + timeout: 100 + timeout: "100" + use-author: true + wipe-workspace: true diff --git a/tests/multibranch/fixtures/scm_github_minimal.xml b/tests/multibranch/fixtures/scm_github_minimal.xml index 81c27b98..3755cc69 100644 --- a/tests/multibranch/fixtures/scm_github_minimal.xml +++ b/tests/multibranch/fixtures/scm_github_minimal.xml @@ -46,6 +46,9 @@ <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> diff --git a/tests/multibranch/fixtures/scm_github_no_fork_pr_discovery.xml b/tests/multibranch/fixtures/scm_github_no_fork_pr_discovery.xml index e856c016..33dfc138 100644 --- a/tests/multibranch/fixtures/scm_github_no_fork_pr_discovery.xml +++ b/tests/multibranch/fixtures/scm_github_no_fork_pr_discovery.xml @@ -42,6 +42,9 @@ <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> |