diff --git a/README.md b/README.md
index 400455d..13b2c4d 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,8 @@ It allows the users to view the history of their pipelines with stage informatio

+
+
Releases:
- 1.8 Added the option for showing only the last build of a pipeline
@@ -26,3 +28,4 @@ Releases:
to be displayed
- 1.0: initial release a dashboard like view that selects only
pipelines and presents the stages and the commits on each build.
+
diff --git a/pom.xml b/pom.xml
index f9dbf78..b7bfa1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,9 @@
com.paul8620.jenkins.plugins
pipeline-aggregator-view
- 1.12-SNAPSHOT
+
+ 1.9.1-SNAPSHOT
+
hpi
diff --git a/src/main/java/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator.java b/src/main/java/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator.java
index 2cb514d..7e3ec5b 100644
--- a/src/main/java/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator.java
+++ b/src/main/java/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator.java
@@ -39,6 +39,8 @@ public class PipelineAggregator extends View {
private int buildHistorySize;
+ private int refreshInterval;
+
private boolean useCondensedTables;
private boolean onlyLastBuild;
@@ -47,15 +49,26 @@ public class PipelineAggregator extends View {
private String filterRegex;
+ private boolean showCommitInfo;
+ private boolean showBuildNumber;
+ private boolean showBuildTime;
+ private boolean showBuildDuration;
+
@DataBoundConstructor
public PipelineAggregator(String name, String viewName) {
super(name);
this.viewName = viewName;
this.fontSize = 16;
this.buildHistorySize = 16;
+ this.refreshInterval = 15;
this.useCondensedTables = false;
this.onlyLastBuild = false;
this.filterRegex = null;
+
+ this.showCommitInfo = true;
+ this.showBuildNumber = true;
+ this.showBuildTime = true;
+ this.showBuildDuration = true;
}
protected Object readResolve() {
@@ -63,6 +76,8 @@ protected Object readResolve() {
fontSize = 16;
if (buildHistorySize == 0)
buildHistorySize = 16;
+ if (refreshInterval == 0)
+ refreshInterval = 15;
return this;
}
@@ -83,6 +98,38 @@ public boolean isUseCondensedTables() {
return useCondensedTables;
}
+ public boolean isShowCommitInfo() {
+ return showCommitInfo;
+ }
+
+ public void setShowCommitInfo(boolean showCommitInfo) {
+ this.showCommitInfo = showCommitInfo;
+ }
+
+ public boolean isShowBuildNumber() {
+ return showBuildNumber;
+ }
+
+ public void setShowBuildNumber(boolean showBuildNumber) {
+ this.showBuildNumber = showBuildNumber;
+ }
+
+ public boolean isShowBuildTime() {
+ return showBuildTime;
+ }
+
+ public void setShowBuildTime(boolean showBuildTime) {
+ this.showBuildTime = showBuildTime;
+ }
+
+ public boolean isShowBuildDuration() {
+ return showBuildDuration;
+ }
+
+ public void setShowBuildDuration(boolean showBuildDuration) {
+ this.showBuildDuration = showBuildDuration;
+ }
+
public boolean isUseScrollingCommits() {
return useScrollingCommits;
}
@@ -107,14 +154,29 @@ public String getFilterRegex() {
return filterRegex;
}
+ public int getRefreshInterval() {
+ return refreshInterval;
+ }
+
+ public void setRefreshInterval(int refreshInterval) {
+ this.refreshInterval = refreshInterval;
+ }
+
@Override
protected void submit(StaplerRequest req) throws ServletException, IOException {
JSONObject json = req.getSubmittedForm();
this.fontSize = json.getInt("fontSize");
this.buildHistorySize = json.getInt("buildHistorySize");
+ this.refreshInterval = json.getInt("refreshInterval");
this.useCondensedTables = json.getBoolean("useCondensedTables");
this.useScrollingCommits = json.getBoolean("useScrollingCommits");
- this.onlyLastBuild = json.getBoolean("onlyLastBuild");
+ this.onlyLastBuild = json.getBoolean("onlyLastBuild");
+
+ this.showCommitInfo = json.getBoolean("showCommitInfo");
+ this.showBuildNumber = json.getBoolean("showBuildNumber");
+ this.showBuildTime = json.getBoolean("showBuildTime");
+ this.showBuildDuration = json.getBoolean("showBuildDuration");
+
if (json.get("useRegexFilter") != null) {
String regexToTest = req.getParameter("filterRegex");
try {
diff --git a/src/main/resources/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator/configure-entries.jelly b/src/main/resources/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator/configure-entries.jelly
index 8e15bb3..4bc7a1b 100644
--- a/src/main/resources/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator/configure-entries.jelly
+++ b/src/main/resources/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator/configure-entries.jelly
@@ -14,6 +14,9 @@
+
+
+
@@ -24,4 +27,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator/index.jelly b/src/main/resources/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator/index.jelly
index 1ac46b0..e64ce90 100644
--- a/src/main/resources/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator/index.jelly
+++ b/src/main/resources/com/ooyala/jenkins/plugins/pipelineaggregatorview/PipelineAggregator/index.jelly
@@ -20,6 +20,24 @@
+
+
@@ -33,8 +51,22 @@
- | ${%Job} | Stages | ${%Commits} | ${%Build} | ${%Finished} | ${%Duration
- } |
+ | ${%Job} | Stages |
+
+
@@ -45,18 +77,7 @@