1
0
Fork 0

Switch to github-branch-source plugin.

This commit is contained in:
Fleur Kelpin 2018-06-29 00:15:41 +02:00
parent 3ac611e69f
commit f6ba15e9f5
3 changed files with 79 additions and 51 deletions

View File

@ -1,6 +1,6 @@
name: molgenis-jenkins name: molgenis-jenkins
home: https://jenkins.io/ home: https://jenkins.io/
version: 0.2.2 version: 0.2.3
appVersion: 2.107 appVersion: 2.107
description: Molgenis installation for the jenkins chart. description: Molgenis installation for the jenkins chart.
sources: sources:

View File

@ -0,0 +1,16 @@
apiVersion: v1
kind: Secret
metadata:
# this is the jenkins id.
name: "molgenis-jenkins-github-secret"
labels:
# so we know what type it is.
"jenkins.io/credentials-type": "usernamePassword"
annotations: {
# description - can not be a label as spaces are not allowed
"jenkins.io/credentials-description" : "oauth token for the molgenis-jenkins github user"
}
type: Opaque
data:
username: {{ "molgenis-jenkins" | b64enc | quote }}
password: {{ .Values.PipelineSecrets.Env.GithubToken | b64enc | quote }}

View File

@ -8,59 +8,71 @@ jenkins:
- workflow-job:2.21 - workflow-job:2.21
- credentials-binding:1.16 - credentials-binding:1.16
- git:3.9.1 - git:3.9.1
- github-branch-source:2.3.6
- kubernetes-credentials-provider:0.9
Jobs: |- Jobs: |-
molgenis: |- molgenis: |-
<?xml version='1.1' encoding='UTF-8'?> <?xml version='1.1' encoding='UTF-8'?>
<org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject plugin="workflow-multibranch@2.19"> <jenkins.branch.OrganizationFolder plugin="branch-api@2.0.20">
<actions/> <actions/>
<description></description> <description></description>
<properties> <properties>
<org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3"> <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.1">
<dockerLabel></dockerLabel> <dockerLabel></dockerLabel>
<registry plugin="docker-commons@1.13"/> <registry plugin="docker-commons@1.13"/>
</org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig> </org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig>
</properties> <jenkins.branch.NoTriggerOrganizationFolderProperty>
<folderViews class="jenkins.branch.MultiBranchProjectViewHolder" plugin="branch-api@2.0.20"> <branches>.*</branches>
<owner class="org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject" reference="../.."/> </jenkins.branch.NoTriggerOrganizationFolderProperty>
</folderViews> </properties>
<healthMetrics> <folderViews class="jenkins.branch.OrganizationFolderViewHolder">
<com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric plugin="cloudbees-folder@6.5.1"> <owner reference="../.."/>
<nonRecursive>false</nonRecursive> </folderViews>
</com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric> <healthMetrics>
</healthMetrics> <com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric plugin="cloudbees-folder@6.5.1">
<icon class="jenkins.branch.MetadataActionFolderIcon" plugin="branch-api@2.0.20"> <nonRecursive>false</nonRecursive>
<owner class="org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject" reference="../.."/> </com.cloudbees.hudson.plugins.folder.health.WorstChildHealthMetric>
</icon> </healthMetrics>
<orphanedItemStrategy class="com.cloudbees.hudson.plugins.folder.computed.DefaultOrphanedItemStrategy" plugin="cloudbees-folder@6.5.1"> <icon class="jenkins.branch.MetadataActionFolderIcon">
<pruneDeadBranches>true</pruneDeadBranches> <owner class="jenkins.branch.OrganizationFolder" reference="../.."/>
<daysToKeep>-1</daysToKeep> </icon>
<numToKeep>-1</numToKeep> <orphanedItemStrategy class="com.cloudbees.hudson.plugins.folder.computed.DefaultOrphanedItemStrategy" plugin="cloudbees-folder@6.5.1">
</orphanedItemStrategy> <pruneDeadBranches>true</pruneDeadBranches>
<triggers/> <daysToKeep>-1</daysToKeep>
<disabled>false</disabled> <numToKeep>-1</numToKeep>
<sources class="jenkins.branch.MultiBranchProject$BranchSourceList" plugin="branch-api@2.0.20"> </orphanedItemStrategy>
<data> <triggers>
<jenkins.branch.BranchSource> <com.cloudbees.hudson.plugins.folder.computed.PeriodicFolderTrigger plugin="cloudbees-folder@6.5.1">
<source class="jenkins.plugins.git.GitSCMSource" plugin="git@3.9.1"> <spec>H H * * *</spec>
<id>a1f535cd-ab83-4d42-8993-0c3e59cf139f</id> <interval>86400000</interval>
<remote>http://github.com/molgenis/molgenis.git</remote> </com.cloudbees.hudson.plugins.folder.computed.PeriodicFolderTrigger>
<credentialsId></credentialsId> </triggers>
<traits> <disabled>false</disabled>
<jenkins.plugins.git.traits.BranchDiscoveryTrait/> <navigators>
</traits> <org.jenkinsci.plugins.github__branch__source.GitHubSCMNavigator plugin="github-branch-source@2.3.6">
</source> <repoOwner>molgenis</repoOwner>
<strategy class="jenkins.branch.DefaultBranchPropertyStrategy"> <credentialsId>molgenis-jenkins-github-secret</credentialsId>
<properties class="empty-list"/> <traits>
</strategy> <org.jenkinsci.plugins.github__branch__source.BranchDiscoveryTrait>
</jenkins.branch.BranchSource> <strategyId>1</strategyId>
</data> </org.jenkinsci.plugins.github__branch__source.BranchDiscoveryTrait>
<owner class="org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject" reference="../.."/> <org.jenkinsci.plugins.github__branch__source.OriginPullRequestDiscoveryTrait>
</sources> <strategyId>1</strategyId>
<factory class="org.jenkinsci.plugins.workflow.multibranch.WorkflowBranchProjectFactory"> </org.jenkinsci.plugins.github__branch__source.OriginPullRequestDiscoveryTrait>
<owner class="org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject" reference="../.."/> <org.jenkinsci.plugins.github__branch__source.ForkPullRequestDiscoveryTrait>
<scriptPath>Jenkinsfile</scriptPath> <strategyId>1</strategyId>
</factory> <trust class="org.jenkinsci.plugins.github_branch_source.ForkPullRequestDiscoveryTrait$TrustPermission"/>
</org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject> </org.jenkinsci.plugins.github__branch__source.ForkPullRequestDiscoveryTrait>
</traits>
</org.jenkinsci.plugins.github__branch__source.GitHubSCMNavigator>
</navigators>
<projectFactories>
<org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProjectFactory plugin="workflow-multibranch@2.19">
<scriptPath>Jenkinsfile</scriptPath>
</org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProjectFactory>
</projectFactories>
<buildStrategies/>
</jenkins.branch.OrganizationFolder>
# Kubernetes secret that contains a 'credentials.xml' for Jenkins # Kubernetes secret that contains a 'credentials.xml' for Jenkins
# CredentialsXmlSecret: jenkins-credentials # CredentialsXmlSecret: jenkins-credentials
# Kubernetes secret that contains files to be put in the Jenkins 'secrets' directory, # Kubernetes secret that contains files to be put in the Jenkins 'secrets' directory,