1
0

Merge branch 'chore/jenkins-gitsource' of P129679/molgenis-ops-docker-helm into master

This commit is contained in:
Sido Haakma 2018-09-27 16:28:20 +02:00 committed by Gogs
commit dfd8872e58

View File

@ -83,6 +83,17 @@ jenkins:
<trust class="org.jenkinsci.plugins.github_branch_source.ForkPullRequestDiscoveryTrait$TrustPermission"/> <trust class="org.jenkinsci.plugins.github_branch_source.ForkPullRequestDiscoveryTrait$TrustPermission"/>
</org.jenkinsci.plugins.github__branch__source.ForkPullRequestDiscoveryTrait> </org.jenkinsci.plugins.github__branch__source.ForkPullRequestDiscoveryTrait>
<org.jenkinsci.plugins.scm__filter.GitHubCommitSkipTrait plugin="github-scm-trait-commit-skip@0.1.1"/> <org.jenkinsci.plugins.scm__filter.GitHubCommitSkipTrait plugin="github-scm-trait-commit-skip@0.1.1"/>
<jenkins.plugins.git.traits.LocalBranchTrait plugin="git@3.9.1">
<extension class="hudson.plugins.git.extensions.impl.LocalBranch">
<localBranch>**</localBranch>
</extension>
</jenkins.plugins.git.traits.LocalBranchTrait>
<jenkins.plugins.git.traits.UserIdentityTrait plugin="git@3.9.1">
<extension class="hudson.plugins.git.extensions.impl.UserIdentity">
<name>MOLGENIS Jenkins</name>
<email>molgenis+ci@gmail.com</email>
</extension>
</jenkins.plugins.git.traits.UserIdentityTrait>
</traits> </traits>
</org.jenkinsci.plugins.github__branch__source.GitHubSCMNavigator> </org.jenkinsci.plugins.github__branch__source.GitHubSCMNavigator>
</navigators> </navigators>
@ -132,6 +143,17 @@ jenkins:
<credentialsId>molgenis-jenkins-gogs-secret</credentialsId> <credentialsId>molgenis-jenkins-gogs-secret</credentialsId>
<traits> <traits>
<jenkins.plugins.git.traits.BranchDiscoveryTrait/> <jenkins.plugins.git.traits.BranchDiscoveryTrait/>
<jenkins.plugins.git.traits.LocalBranchTrait plugin="git@3.9.1">
<extension class="hudson.plugins.git.extensions.impl.LocalBranch">
<localBranch>**</localBranch>
</extension>
</jenkins.plugins.git.traits.LocalBranchTrait>
<jenkins.plugins.git.traits.UserIdentityTrait plugin="git@3.9.1">
<extension class="hudson.plugins.git.extensions.impl.UserIdentity">
<name>MOLGENIS Jenkins</name>
<email>molgenis+ci@gmail.com</email>
</extension>
</jenkins.plugins.git.traits.UserIdentityTrait>
</traits> </traits>
</source> </source>
<strategy class="jenkins.branch.DefaultBranchPropertyStrategy"> <strategy class="jenkins.branch.DefaultBranchPropertyStrategy">
@ -185,6 +207,17 @@ jenkins:
<credentialsId>molgenis-jenkins-gogs-secret</credentialsId> <credentialsId>molgenis-jenkins-gogs-secret</credentialsId>
<traits> <traits>
<jenkins.plugins.git.traits.BranchDiscoveryTrait/> <jenkins.plugins.git.traits.BranchDiscoveryTrait/>
<jenkins.plugins.git.traits.LocalBranchTrait plugin="git@3.9.1">
<extension class="hudson.plugins.git.extensions.impl.LocalBranch">
<localBranch>**</localBranch>
</extension>
</jenkins.plugins.git.traits.LocalBranchTrait>
<jenkins.plugins.git.traits.UserIdentityTrait plugin="git@3.9.1">
<extension class="hudson.plugins.git.extensions.impl.UserIdentity">
<name>MOLGENIS Jenkins</name>
<email>molgenis+ci@gmail.com</email>
</extension>
</jenkins.plugins.git.traits.UserIdentityTrait>
</traits> </traits>
</source> </source>
<strategy class="jenkins.branch.DefaultBranchPropertyStrategy"> <strategy class="jenkins.branch.DefaultBranchPropertyStrategy">
@ -238,6 +271,17 @@ jenkins:
<credentialsId>molgenis-jenkins-gogs-secret</credentialsId> <credentialsId>molgenis-jenkins-gogs-secret</credentialsId>
<traits> <traits>
<jenkins.plugins.git.traits.BranchDiscoveryTrait/> <jenkins.plugins.git.traits.BranchDiscoveryTrait/>
<jenkins.plugins.git.traits.LocalBranchTrait plugin="git@3.9.1">
<extension class="hudson.plugins.git.extensions.impl.LocalBranch">
<localBranch>**</localBranch>
</extension>
</jenkins.plugins.git.traits.LocalBranchTrait>
<jenkins.plugins.git.traits.UserIdentityTrait plugin="git@3.9.1">
<extension class="hudson.plugins.git.extensions.impl.UserIdentity">
<name>MOLGENIS Jenkins</name>
<email>molgenis+ci@gmail.com</email>
</extension>
</jenkins.plugins.git.traits.UserIdentityTrait>
</traits> </traits>
</source> </source>
<strategy class="jenkins.branch.DefaultBranchPropertyStrategy"> <strategy class="jenkins.branch.DefaultBranchPropertyStrategy">
@ -291,6 +335,17 @@ jenkins:
<credentialsId>molgenis-jenkins-gogs-secret</credentialsId> <credentialsId>molgenis-jenkins-gogs-secret</credentialsId>
<traits> <traits>
<jenkins.plugins.git.traits.BranchDiscoveryTrait/> <jenkins.plugins.git.traits.BranchDiscoveryTrait/>
<jenkins.plugins.git.traits.LocalBranchTrait plugin="git@3.9.1">
<extension class="hudson.plugins.git.extensions.impl.LocalBranch">
<localBranch>**</localBranch>
</extension>
</jenkins.plugins.git.traits.LocalBranchTrait>
<jenkins.plugins.git.traits.UserIdentityTrait plugin="git@3.9.1">
<extension class="hudson.plugins.git.extensions.impl.UserIdentity">
<name>MOLGENIS Jenkins</name>
<email>molgenis+ci@gmail.com</email>
</extension>
</jenkins.plugins.git.traits.UserIdentityTrait>
</traits> </traits>
</source> </source>
<strategy class="jenkins.branch.DefaultBranchPropertyStrategy"> <strategy class="jenkins.branch.DefaultBranchPropertyStrategy">
@ -344,6 +399,17 @@ jenkins:
<credentialsId>molgenis-jenkins-gogs-secret</credentialsId> <credentialsId>molgenis-jenkins-gogs-secret</credentialsId>
<traits> <traits>
<jenkins.plugins.git.traits.BranchDiscoveryTrait/> <jenkins.plugins.git.traits.BranchDiscoveryTrait/>
<jenkins.plugins.git.traits.LocalBranchTrait plugin="git@3.9.1">
<extension class="hudson.plugins.git.extensions.impl.LocalBranch">
<localBranch>**</localBranch>
</extension>
</jenkins.plugins.git.traits.LocalBranchTrait>
<jenkins.plugins.git.traits.UserIdentityTrait plugin="git@3.9.1">
<extension class="hudson.plugins.git.extensions.impl.UserIdentity">
<name>MOLGENIS Jenkins</name>
<email>molgenis+ci@gmail.com</email>
</extension>
</jenkins.plugins.git.traits.UserIdentityTrait>
</traits> </traits>
</source> </source>
<strategy class="jenkins.branch.DefaultBranchPropertyStrategy"> <strategy class="jenkins.branch.DefaultBranchPropertyStrategy">