molgenis-jenkins/Chart.yaml

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

molgenis-jenkins/templates/config.tpl

@@ -139,37 +139,8 @@ data:
                   <resourceLimitCpu>{{.Values.Pod.Cpu}}</resourceLimitCpu>
                   <resourceLimitMemory>{{.Values.Pod.Memory}}</resourceLimitMemory>
                 </org.csanchez.jenkins.plugins.kubernetes.ContainerTemplate>
-                <org.csanchez.jenkins.plugins.kubernetes.ContainerTemplate>
-                  <name>alpine</name>
-                  <image>spotify/alpine</image>
-                  <privileged>false</privileged>
-                  <alwaysPullImage>false</alwaysPullImage>
-                  <workingDir>/home/jenkins</workingDir>
-                  <command>/bin/sh -c</command>
-                  <args>cat</args>
-                  <ttyEnabled>true</ttyEnabled>
-                  <resourceRequestCpu></resourceRequestCpu>
-                  <resourceRequestMemory></resourceRequestMemory>
-                  <resourceLimitCpu></resourceLimitCpu>
-                  <resourceLimitMemory></resourceLimitMemory>
-                  <ports/>
-                  <livenessProbe>
-                    <execArgs></execArgs>
-                    <timeoutSeconds>0</timeoutSeconds>
-                    <initialDelaySeconds>0</initialDelaySeconds>
-                    <failureThreshold>0</failureThreshold>
-                    <periodSeconds>0</periodSeconds>
-                    <successThreshold>0</successThreshold>
-                  </livenessProbe>
-                </org.csanchez.jenkins.plugins.kubernetes.ContainerTemplate>
               </containers>
               <envVars>
-                <envVars>
-                  <org.csanchez.jenkins.plugins.kubernetes.model.KeyValueEnvVar>
-                    <key>JENKINS_URL</key>
-                    <value>http://{{ template "jenkins.fullname" . }}:{{.Values.Master.ServicePort}}{{ default "" .Values.Master.JenkinsUriPrefix }}</value>
-                  </org.csanchez.jenkins.plugins.kubernetes.model.KeyValueEnvVar>
-                </envVars>
                 <org.csanchez.jenkins.plugins.kubernetes.model.SecretEnvVar>
                   <key>PGP_PASSPHRASE</key>
                   <secretName>molgenis-pipeline-env-secret</secretName>

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

@@ -1,16 +0,0 @@
-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,71 +8,59 @@ 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'?>
-        <jenkins.branch.OrganizationFolder plugin="branch-api@2.0.20">
+        <org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject plugin="workflow-multibranch@2.19">
             <actions/>
             <description></description>
             <properties>
-            <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3.1">
+                <org.jenkinsci.plugins.pipeline.modeldefinition.config.FolderConfig plugin="pipeline-model-definition@1.3">
                     <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.OrganizationFolderViewHolder">
+            <folderViews class="jenkins.branch.MultiBranchProjectViewHolder" plugin="branch-api@2.0.20">
-            <owner reference="../.."/>
+                <owner class="org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject" 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">
+            <icon class="jenkins.branch.MetadataActionFolderIcon" plugin="branch-api@2.0.20">
-            <owner class="jenkins.branch.OrganizationFolder" reference="../.."/>
+                <owner class="org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject" 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>
-          <navigators>
+            <sources class="jenkins.branch.MultiBranchProject$BranchSourceList" plugin="branch-api@2.0.20">
-            <org.jenkinsci.plugins.github__branch__source.GitHubSCMNavigator plugin="github-branch-source@2.3.6">
+                <data>
-              <repoOwner>molgenis</repoOwner>
+                    <jenkins.branch.BranchSource>
-              <credentialsId>molgenis-jenkins-github-secret</credentialsId>
+                        <source class="jenkins.plugins.git.GitSCMSource" plugin="git@3.9.1">
+                            <id>a1f535cd-ab83-4d42-8993-0c3e59cf139f</id>
+                            <remote>http://github.com/molgenis/molgenis.git</remote>
+                            <credentialsId></credentialsId>
                             <traits>
-                <org.jenkinsci.plugins.github__branch__source.BranchDiscoveryTrait>
+                                <jenkins.plugins.git.traits.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>
-            </org.jenkinsci.plugins.github__branch__source.GitHubSCMNavigator>
+                        </source>
-          </navigators>
+                        <strategy class="jenkins.branch.DefaultBranchPropertyStrategy">
-          <projectFactories>
+                            <properties class="empty-list"/>
-            <org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProjectFactory plugin="workflow-multibranch@2.19">
+                        </strategy>
+                    </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>
-            </org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProjectFactory>
+            </factory>
-          </projectFactories>
+        </org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject>
-          <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,