From e54f958add0e2389d7722e1025b07f65f2677dec Mon Sep 17 00:00:00 2001
From: sido <sido@haakma.org>
Date: Sat, 18 Aug 2018 22:16:13 +0200
Subject: [PATCH 1/5] fix views by reorder the views

---
 molgenis-jenkins/templates/config.tpl | 75 +++++++++++++--------------
 1 file changed, 37 insertions(+), 38 deletions(-)

diff --git a/molgenis-jenkins/templates/config.tpl b/molgenis-jenkins/templates/config.tpl
index d899427..37ab9a8 100644
--- a/molgenis-jenkins/templates/config.tpl
+++ b/molgenis-jenkins/templates/config.tpl
@@ -32,7 +32,43 @@ data:
       <buildsDir>${ITEM_ROOTDIR}/builds</buildsDir>
       <markupFormatter class="hudson.markup.EscapedMarkupFormatter"/>
       <jdks/>
-      <primaryView>dev</primaryView>
+      <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>
+{{- range $viewName, $view := .Values.Master.Views }}
+        <listView>
+          <owner class="hudson" reference="../../.."/>
+          <name>{{ $viewName }}</name>
+          <filterExecutors>false</filterExecutors>
+          <filterQueue>false</filterQueue>
+          <properties class="hudson.model.View$PropertyList"/>
+          <jobNames>
+             <comparator class="hudson.util.CaseInsensitiveComparator" reference="../../../listView/jobNames/comparator"/>
+{{- range $index, $job := $view }}
+             <string>{{ $job }}</string>
+{{- end }}
+          </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>
+{{- end }}
+      </views>
+      <primaryView>{{ .Values.Master.DefaultView }}</primaryView>
       <viewsTabBar class="hudson.views.DefaultViewsTabBar"/>
       <myViewsTabBar class="hudson.views.DefaultMyViewsTabBar"/>
       <clouds>
@@ -157,43 +193,6 @@ data:
       </clouds>
       <quietPeriod>5</quietPeriod>
       <scmCheckoutRetryCount>0</scmCheckoutRetryCount>
-      <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>
-{{- range $viewName, $view := .Values.Master.Views }}
-        <listView>
-          <owner class="hudson" reference="../../.."/>
-          <name>{{ $viewName }}</name>
-          <filterExecutors>false</filterExecutors>
-          <filterQueue>false</filterQueue>
-          <properties class="hudson.model.View$PropertyList"/>
-          <jobNames>
-             <comparator class="hudson.util.CaseInsensitiveComparator" reference="../../../listView/jobNames/comparator"/>
-{{- range $index, $job := $view }}
-             <string>{{ $job }}</string>
-{{- end }}
-          </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>
-{{- end }}
-      </views>
-      <primaryView>{{ .Values.Master.DefaultView }}</primaryView>
       <slaveAgentPort>50000</slaveAgentPort>
       <disabledAgentProtocols>
 {{- range .Values.Master.DisabledAgentProtocols }}

From acbd380a0cd673d6a614181f85f0700403663eb2 Mon Sep 17 00:00:00 2001
From: sido <sido@haakma.org>
Date: Sat, 18 Aug 2018 22:36:05 +0200
Subject: [PATCH 2/5] updated plugins

---
 molgenis-jenkins/values.yaml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/molgenis-jenkins/values.yaml b/molgenis-jenkins/values.yaml
index 875b9c1..ae82b58 100644
--- a/molgenis-jenkins/values.yaml
+++ b/molgenis-jenkins/values.yaml
@@ -3,17 +3,16 @@ jenkins:
     HostName: jenkins.molgenis.org
     ServiceType: ClusterIP
     InstallPlugins:
-      - kubernetes:1.12.0
+      - kubernetes:1.12.3
       - workflow-aggregator:2.5
-      - workflow-job:2.21
+      - workflow-job:2.24
       - credentials-binding:1.16
       - git:3.9.1
       - github-branch-source:2.3.6
       - kubernetes-credentials-provider:0.9
-      - blueocean:1.6.2
+      - blueocean:1.8.2
       - github-oauth:0.29
       - gogs-webhook:1.0.14
-      - sauce-ondemand:1.176
     Security:
       UseGitHub: false
       GitHub:

From 44044b59aa943c25aff5cbd255145d7b2928bf44 Mon Sep 17 00:00:00 2001
From: sido <sido@haakma.org>
Date: Sat, 18 Aug 2018 23:12:02 +0200
Subject: [PATCH 3/5] updated views

---
 molgenis-jenkins/templates/config.tpl | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/molgenis-jenkins/templates/config.tpl b/molgenis-jenkins/templates/config.tpl
index 37ab9a8..ed465d2 100644
--- a/molgenis-jenkins/templates/config.tpl
+++ b/molgenis-jenkins/templates/config.tpl
@@ -49,9 +49,6 @@ data:
           <properties class="hudson.model.View$PropertyList"/>
           <jobNames>
              <comparator class="hudson.util.CaseInsensitiveComparator" reference="../../../listView/jobNames/comparator"/>
-{{- range $index, $job := $view }}
-             <string>{{ $job }}</string>
-{{- end }}
           </jobNames>
           <jobFilters/>
           <columns>

From 2d84fb08a8eedaa72d40deb34f869783956388ee Mon Sep 17 00:00:00 2001
From: sido <sido@haakma.org>
Date: Sat, 18 Aug 2018 23:12:54 +0200
Subject: [PATCH 4/5] updated views

---
 molgenis-jenkins/templates/config.tpl | 2 --
 1 file changed, 2 deletions(-)

diff --git a/molgenis-jenkins/templates/config.tpl b/molgenis-jenkins/templates/config.tpl
index ed465d2..ee0d258 100644
--- a/molgenis-jenkins/templates/config.tpl
+++ b/molgenis-jenkins/templates/config.tpl
@@ -66,8 +66,6 @@ data:
 {{- end }}
       </views>
       <primaryView>{{ .Values.Master.DefaultView }}</primaryView>
-      <viewsTabBar class="hudson.views.DefaultViewsTabBar"/>
-      <myViewsTabBar class="hudson.views.DefaultMyViewsTabBar"/>
       <clouds>
         <org.csanchez.jenkins.plugins.kubernetes.KubernetesCloud plugin="kubernetes@{{ template "jenkins.kubernetes-version" . }}">
           <name>kubernetes</name>

From d5ed6e979bfeab6ba9824b028c76b54976d3975a Mon Sep 17 00:00:00 2001
From: sido <sido@haakma.org>
Date: Sat, 18 Aug 2018 23:18:10 +0200
Subject: [PATCH 5/5] updated views

---
 molgenis-jenkins/templates/config.tpl | 71 ++++++++++++++-------------
 1 file changed, 37 insertions(+), 34 deletions(-)

diff --git a/molgenis-jenkins/templates/config.tpl b/molgenis-jenkins/templates/config.tpl
index ee0d258..3493f71 100644
--- a/molgenis-jenkins/templates/config.tpl
+++ b/molgenis-jenkins/templates/config.tpl
@@ -32,40 +32,6 @@ 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>
-{{- range $viewName, $view := .Values.Master.Views }}
-        <listView>
-          <owner class="hudson" reference="../../.."/>
-          <name>{{ $viewName }}</name>
-          <filterExecutors>false</filterExecutors>
-          <filterQueue>false</filterQueue>
-          <properties class="hudson.model.View$PropertyList"/>
-          <jobNames>
-             <comparator class="hudson.util.CaseInsensitiveComparator" reference="../../../listView/jobNames/comparator"/>
-          </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>
-{{- end }}
-      </views>
-      <primaryView>{{ .Values.Master.DefaultView }}</primaryView>
       <clouds>
         <org.csanchez.jenkins.plugins.kubernetes.KubernetesCloud plugin="kubernetes@{{ template "jenkins.kubernetes-version" . }}">
           <name>kubernetes</name>
@@ -186,6 +152,43 @@ data:
           <readTimeout>0</readTimeout>
         </org.csanchez.jenkins.plugins.kubernetes.KubernetesCloud>
       </clouds>
+      <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>
+{{- range $viewName, $view := .Values.Master.Views }}
+        <listView>
+          <owner class="hudson" reference="../../.."/>
+          <name>{{ $viewName }}</name>
+          <filterExecutors>false</filterExecutors>
+          <filterQueue>false</filterQueue>
+          <properties class="hudson.model.View$PropertyList"/>
+          <jobNames>
+             <comparator class="hudson.util.CaseInsensitiveComparator" reference="../../../listView/jobNames/comparator"/>
+{{- range $index, $job := $view }}
+             <string>{{ $job }}</string>
+{{- end }}
+          </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>
+{{- end }}
+      </views>
+      <primaryView>{{ .Values.Master.DefaultView }}</primaryView>
       <quietPeriod>5</quietPeriod>
       <scmCheckoutRetryCount>0</scmCheckoutRetryCount>
       <slaveAgentPort>50000</slaveAgentPort>