[JENKINS-30191] Include Matrix Project as dependency

jenkinsci · Oct 12, 2015 · 13df72c · 13df72c
1 parent 7aaf298
commit 13df72c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -463,18 +463,28 @@
             <version>0.3</version>
             <optional>true</optional>            
         </dependency>
+
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>job-dsl</artifactId>
             <version>1.37</version>
             <optional>true</optional>
         </dependency>
+
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>matrix-project</artifactId>
+            <version>1.4</version>
+            <scope>test</scope>            
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.11</version>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>

diff --git a/...java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/TestUtilsFactory.java b/...java/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/TestUtilsFactory.java
@@ -862,7 +862,7 @@ public static boolean printAndReturnConsoleOfBuild(FreeStyleBuild build, String
 
         // the pattern we want to search for
         Pattern p = Pattern.compile("<link rel=\"stylesheet\" type=\"text/css\" href=\"/jenkins/descriptor/hudson.console.ExpandableDetailsNote/style.css\"/>"
-                + ".*<pre>(.*)</pre>.*</td>.*</tr>.*</tbody>.*</table>", Pattern.DOTALL);
+                + ".*<pre.*>(.*)</pre>", Pattern.DOTALL);
         Matcher m = p.matcher(console);
         // if we find a match, get the group
         if (m.find()) {
@@ -873,9 +873,12 @@ public static boolean printAndReturnConsoleOfBuild(FreeStyleBuild build, String
             System.out.format("'%s'\n", capturedText);
             return true;
         } else {
-            System.out.format("Didn't match any relevant part of the console");
+            System.out.format("Didn't match any relevant part of the console%n");
+            System.out.format("Writing full log to trace%n");
+            System.out.format("************************************************************************%n");
+            System.out.format(console+"%n");
+            System.out.format("************************************************************************%n");           
             return false;
         }
-    }
-
+    }     
 }