Merge branch 'add-node-container' of p281392/molgenis-ops-docker-helm into master

molgenis-jenkins/Chart.yaml

@@ -1,7 +1,7 @@
 name: molgenis-jenkins
 home: https://jenkins.io/
-version: 0.3.1
+version: 0.3.2
-appVersion: 2.107
+appVersion: 2.121
 description: Molgenis installation for the jenkins chart.
 sources:
 - https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-helm.git

molgenis-jenkins/templates/config.tpl

@@ -32,6 +32,63 @@ data:
       <buildsDir>${ITEM_ROOTDIR}/builds</buildsDir>
       <markupFormatter class="hudson.markup.EscapedMarkupFormatter"/>
       <jdks/>
+      <views>
+        <hudson.model.AllView>
+          <owner class="hudson" reference="../../.."/>
+          <name>all</name>
+          <filterExecutors>false</filterExecutors>
+          <filterQueue>false</filterQueue>
+          <properties class="hudson.model.View$PropertyList"/>
+        </hudson.model.AllView>
+        <listView>
+          <owner class="hudson" reference="../../.."/>
+          <name>ops</name>
+          <filterExecutors>false</filterExecutors>
+          <filterQueue>false</filterQueue>
+          <properties class="hudson.model.View$PropertyList"/>
+          <jobNames>
+            <comparator class="hudson.util.CaseInsensitiveComparator"/>
+            <string>molgenis-ops-docker-httpd</string>
+            <string>molgenis-ops-docker-maven</string>
+          </jobNames>
+          <jobFilters/>
+          <columns>
+            <hudson.views.StatusColumn/>
+            <hudson.views.WeatherColumn/>
+            <hudson.views.JobColumn/>
+            <hudson.views.LastSuccessColumn/>
+            <hudson.views.LastFailureColumn/>
+            <hudson.views.LastDurationColumn/>
+            <hudson.views.BuildButtonColumn/>
+            <hudson.plugins.favorite.column.FavoriteColumn plugin="favorite@2.3.2"/>
+          </columns>
+          <recurse>false</recurse>
+        </listView>
+        <listView>
+          <owner class="hudson" reference="../../.."/>
+          <name>dev</name>
+          <filterExecutors>false</filterExecutors>
+          <filterQueue>false</filterQueue>
+          <properties class="hudson.model.View$PropertyList"/>
+          <jobNames>
+            <comparator class="hudson.util.CaseInsensitiveComparator" reference="../../../listView/jobNames/comparator"/>
+            <string>molgenis</string>
+          </jobNames>
+          <jobFilters/>
+          <columns>
+            <hudson.views.StatusColumn/>
+            <hudson.views.WeatherColumn/>
+            <hudson.views.JobColumn/>
+            <hudson.views.LastSuccessColumn/>
+            <hudson.views.LastFailureColumn/>
+            <hudson.views.LastDurationColumn/>
+            <hudson.views.BuildButtonColumn/>
+            <hudson.plugins.favorite.column.FavoriteColumn plugin="favorite@2.3.2"/>
+          </columns>
+          <recurse>false</recurse>
+        </listView>
+      </views>
+      <primaryView>dev</primaryView>
       <viewsTabBar class="hudson.views.DefaultViewsTabBar"/>
       <myViewsTabBar class="hudson.views.DefaultMyViewsTabBar"/>
       <clouds>

molgenis-jenkins/values.yaml

@@ -12,6 +12,7 @@ jenkins:
       - kubernetes-credentials-provider:0.9
       - blueocean:1.6.2
       - github-oauth:0.29
+      - gogs-webhook:1.0.14
     Security:
       UseGitHub: false
       GitHub:
@@ -80,7 +81,7 @@ jenkins:
           </projectFactories>
           <buildStrategies/>
         </jenkins.branch.OrganizationFolder>
-      molgenis-operations: |-
+      molgenis-ops-docker-httpd: |-
         <?xml version='1.1' encoding='UTF-8'?>
         <org.jenkinsci.plugins.workflow.multibranch.WorkflowMultiBranchProject plugin="workflow-multibranch@2.19">
           <actions/>
@@ -116,7 +117,7 @@ jenkins:
                 <source class="jenkins.plugins.git.GitSCMSource" plugin="git@3.9.1">
                   <id>a756941d-6c9d-4492-bcf9-327041764be6</id>
                   <remote>https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-httpd.git</remote>
-                  <credentialsId>molgenis-jenkins-github-secret</credentialsId>
+                  <credentialsId>molgenis-jenkins-gogs-secret</credentialsId>
                   <traits>
                     <jenkins.plugins.git.traits.BranchDiscoveryTrait/>
                   </traits>
@@ -167,8 +168,8 @@ jenkins:
               <jenkins.branch.BranchSource>
                 <source class="jenkins.plugins.git.GitSCMSource" plugin="git@3.9.1">
                   <id>4702479a-6988-4a85-b4b7-e77fa2d05ffa</id>
-                  <remote>https://git.webhosting.rug.nl/molgenis/molgenis=ops-docker-maven.git</remote>
+                  <remote>https://git.webhosting.rug.nl/molgenis/molgenis-ops-docker-maven.git</remote>
-                  <credentialsId></credentialsId>
+                  <credentialsId>molgenis-jenkins-gogs-secret</credentialsId>
                   <traits>
                     <jenkins.plugins.git.traits.BranchDiscoveryTrait/>
                   </traits>
@@ -218,6 +219,11 @@ jenkins:
           Image: "spotify/alpine"
           Command: cat
           TTY: true
+        node:
+          Image: "node"
+          ImageTag: "9.11.2"
+          Command: cat
+          TTY: true
       EnvVars:
         - type: Secret
           key: PGP_PASSPHRASE