[jenkinscat-docs] master: Support for displaying ssh settings on the configuration page. (aba7345)
immanetize at fedoraproject.org
immanetize at fedoraproject.org
Fri Feb 6 07:41:23 UTC 2015
Repository : http://git.fedorahosted.org/cgit/jenkinscat-docs.git
On branch : master
>---------------------------------------------------------------
commit aba7345e8c387cd7b0388f9010736b662847fbc5
Author: Pavel Tisnovsky <ptisnovs at redhat.com>
Date: Tue Feb 3 11:33:20 2015 +0100
Support for displaying ssh settings on the configuration page.
>---------------------------------------------------------------
ChangeLog | 6 ++++++
src/jenkinscat/renderers/configuration_page.clj | 4 +++-
src/jenkinscat/server.clj | 8 ++++++++
3 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index db62429..6190efe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-03 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * src/jenkinscat/renderers/configuration_page.clj:
+ * src/jenkinscat/server.clj:
+ Support for displaying ssh settings on the configuration page.
+
2015-02-02 Pavel Tisnovsky <ptisnovs at redhat.com>
* src/jenkinscat/server.clj:
diff --git a/src/jenkinscat/renderers/configuration_page.clj b/src/jenkinscat/renderers/configuration_page.clj
index 9bb3c0c..a2b9fa8 100644
--- a/src/jenkinscat/renderers/configuration_page.clj
+++ b/src/jenkinscat/renderers/configuration_page.clj
@@ -48,9 +48,10 @@
[:table {:class "table table-striped table-condensed table-hover table-borderer"}
[:tr
- [:th {:style "width:25%"} "Job name"]
+ [:th {:style "width:24%"} "Job name"]
[:th {:style "width:20%"} "GIT repo"]
[:th {:style "width:8%"} "Branch"]
+ [:th {:style "width:3%"} "Use ssh?"]
[:th {:style "width:4%"} "Artifact<br />2keep"]
[:th {:style "width:5%"} "Trigger"]
[:th {:style "width:11%"} "Artifacts"]
@@ -65,6 +66,7 @@
[:td [:a {:href (str jobs-href-prefix (:job-name job-configuration))} job-key]]
[:td (:git-repo job-configuration)]
[:td (:branch job-configuration)]
+ [:td (:use-ssh job-configuration)]
[:td (:artifacts2keep job-configuration)]
[:td (:trigger job-configuration)]
[:td (:artifacts job-configuration)]
diff --git a/src/jenkinscat/server.clj b/src/jenkinscat/server.clj
index f284878..872c9c1 100644
--- a/src/jenkinscat/server.clj
+++ b/src/jenkinscat/server.clj
@@ -609,6 +609,12 @@
[scm-node]
(->> scm-node :content second :content first :content first :content first))
+(defn read-use-ssh
+ [scm-node]
+ (if (->> scm-node :content second :content first :content second :content first)
+ "yes"
+ "no"))
+
(defn read-branch-from-xml
[scm-node]
(->> scm-node :content third :content first :content first :content first))
@@ -656,11 +662,13 @@
exclude (read-exclude-from-xml publisher-node)
irc (read-irc-settings-from-xml publisher-node)
build-script (read-build-script builders-node)
+ use-ssh (read-use-ssh scm-node)
]
;(clojure.pprint/pprint config-as-xml)
{:job-name updated-job-name
:git-repo git-repo
:branch branch
+ :use-ssh use-ssh
:artifacts2keep artifacts2keep
:trigger trigger
:artifacts artifacts
More information about the docs-commits
mailing list