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

molgenis-jenkins/templates/config.tpl

@@ -174,8 +174,8 @@ data:
           <properties class="hudson.model.View$PropertyList"/>
           <jobNames>
              <comparator class="hudson.util.CaseInsensitiveComparator" reference="../../../listView/jobNames/comparator"/>
-{{- range $index, $job := .Jobs }}
-             <string>{{ .name }}</string>
+{{- range $index, $job := $view }}
+             <string>{{ $job }}</string>
 {{- end }}
           </jobNames>
           <jobFilters/>
@@ -193,7 +193,7 @@ data:
         </listView>
 {{- end }}
       </views>
-      <primaryView>dev</primaryView>
+      <primaryView>{{ .Values.Master.DefaultView }}</primaryView>
       <slaveAgentPort>50000</slaveAgentPort>
       <disabledAgentProtocols>
 {{- range .Values.Master.DisabledAgentProtocols }}

molgenis-jenkins/values.yaml

@@ -18,14 +18,13 @@ jenkins:
       GitHub:
         ClientID: ""
         ClienSecret: ""
+    DefaultView: dev
     Views:
       dev:
-        Jobs:
-          - name: molgenis
+        - molgenis
       ops:
-        Jobs:
-          - name: molgenis-ops-docker-httpd
-          - name: molgenis-ops-docker-maven
+        - molgenis-ops-docker-httpd
+        - molgenis-ops-docker-maven
     Jobs: |-
       molgenis: |-
         <?xml version='1.1' encoding='UTF-8'?>