[JENKINS-26671] Multiple description setter build steps should append

... This commit fixes [JENKINS-26671]: Multiple description setter build steps should append to build description] At the same time it also fixes [JENKINS-14198]: Ability to append a description to existing description for use with flexible publish
jenkinsci · Mar 16, 2015 · 3b98efa · 3b98efa
1 parent 965d2e9
commit 3b98efa
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,6 @@
 description-setter.iml
 target/
+work/
+.project
+.classpath
+.settings
diff --git a/src/main/java/hudson/plugins/descriptionsetter/DescriptionSetterHelper.java b/src/main/java/hudson/plugins/descriptionsetter/DescriptionSetterHelper.java
@@ -60,7 +60,17 @@ public static boolean setDescription(AbstractBuild<?, ?> build,
 			result = urlify(result);
 
 			build.addAction(new DescriptionSetterAction(result));
-			build.setDescription(result);
+			if(build.getDescription() == null)
+			{
+				build.setDescription(result);
+			}
+			else
+			{
+				String oldDescr = build.getDescription();
+				String newDescr = oldDescr + "<br />" + result;
+				build.setDescription(newDescr);
+			}
+
 			listener.getLogger().println(LOG_PREFIX + " Description set: " + result);
 		} catch (IOException e) {
 			e.printStackTrace(listener.error(LOG_PREFIX

diff --git a/src/main/java/hudson/plugins/descriptionsetter/DescriptionSetterPublisher.java b/src/main/java/hudson/plugins/descriptionsetter/DescriptionSetterPublisher.java
@@ -156,6 +156,12 @@ public boolean endRun(MatrixRun run) throws InterruptedException,
 						&& run.getDescription() != null) {
 					build.setDescription(run.getDescription());
 				}
+				else if(build.getDescription() != null && run.getDescription() != null)
+				{
+					String oldDescr = build.getDescription();
+					String newDescr = oldDescr + "<br />" + run.getDescription();
+					build.setDescription(newDescr);
+				}
 				return true;
 			}
 		};