Switch to github-branch-source plugin.

molgenis-jenkins/Chart.yaml

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

molgenis-jenkins/templates/molgenis-jenkins-github-secret.yaml

@@ -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 }}

molgenis-jenkins/values.yaml

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