Fixed output capturing issue, update README

paylogic · Dec 9, 2013 · 7e31e48 · 7e31e48
1 parent 186fddc
commit 7e31e48
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 28 deletions.
diff --git a/AdvancedMercurial/pom.xml b/AdvancedMercurial/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.paylogic</groupId>
     <artifactId>AdvancedMercurial</artifactId>
-    <version>1.0.20</version>
+    <version>1.0.21</version>
     <packaging>hpi</packaging>
 
     <dependencies>

diff --git a/...curial/src/main/java/org/paylogic/jenkins/advancedmercurial/AdvancedMercurialManager.java b/...curial/src/main/java/org/paylogic/jenkins/advancedmercurial/AdvancedMercurialManager.java
@@ -45,7 +45,7 @@ public AdvancedMercurialManager(AbstractBuild build, Launcher launcher, BuildLis
         }
 
         this.executor = new ExecutionHelper(launcher, listener, this.build.getEnvVars(),
-                new FilePath(new File(this.build.getWorkspace() + givenRepoSubdir)));
+                new FilePath(new File(this.build.getWorkspace().toString(), givenRepoSubdir)));
     }
 
     /**

diff --git a/FogbugzPlugin/pom.xml b/FogbugzPlugin/pom.xml
@@ -8,7 +8,7 @@
 
     <groupId>org.paylogic</groupId>
     <artifactId>FogbugzPlugin</artifactId>
-    <version>1.0.20</version>
+    <version>1.0.21</version>
     <packaging>hpi</packaging>
 
     <dependencies>
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.paylogic</groupId>
             <artifactId>AdvancedMercurial</artifactId>
-            <version>1.0.19</version>
+            <version>1.0.21</version>
         </dependency>
         <dependency>
             <groupId>org.paylogic</groupId>

diff --git a/GatekeeperPlugin/pom.xml b/GatekeeperPlugin/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>org.paylogic</groupId>
   <artifactId>GatekeeperPlugin</artifactId>
-  <version>1.0.20</version>
+  <version>1.0.21</version>
   <packaging>hpi</packaging>
 
     <dependencies>
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>org.paylogic</groupId>
             <artifactId>FogbugzPlugin</artifactId>
-            <version>1.0.20</version>
+            <version>1.0.21</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>org.paylogic</groupId>
             <artifactId>AdvancedMercurial</artifactId>
-            <version>1.0.20</version>
+            <version>1.0.21</version>
         </dependency>
         <dependency>
           <groupId>org.paylogic</groupId>

diff --git a/README.rst b/README.rst
@@ -21,24 +21,25 @@ How to get a build using all the plugins running
 ------------------------------------------------
 
 * Install all .hpi files by uploading them to the Jenkins plugin manager.
-  * Ensure you have installed the seperately provided Redis plugin.
-  * Also install the Mercurial and Multiple-SCMs plugins from the Jenkins marketplace.
+    * Ensure you have installed the seperately provided Redis plugin.
+    * Also install the Mercurial and Multiple-SCMs plugins from the Jenkins marketplace.
 * Go to Jenkins' global settings page and set:
-  * Your redis server
-  * Your fogbugz information (you need to get a api token manually)
-  * The case to build on a fogbugz trigger (listed under fogbugz settings)
+    * Your redis server
+    * Your fogbugz information (you need to get a api token manually)
+    * The case to build on a fogbugz trigger (listed under fogbugz settings)
 * Create or edit a build and set the following:
-  * Make your build parametrized, and include 'CASE_ID' (and optionally REPO_SUBDIR for MultiSCM) string parameters.
-  * (Optional) If you use Multi-SCM, make your repository to merge on have $REPO_SUBDIR as path to checkout in.
-  * (Optional) set a build name like this: 'Case ${ENV, var="CASE_ID"} - Branch ${ENV, var="NODE_ID"} || Build #${BUILD_NUMBER}'
-  * Ensure you have the following build steps in this order:
-      * Add the 'Perform Gatekeepering' step and check the checkbox
-      * Add your build and tests steps
-      * Add the 'Perform Upmerging of release branches' step
-      * Add the 'Perform a Mercurial Push command' step
-  * Under post-build actions add:
-      * Add the 'Add fogbugz link to case on build page' action
-      * Add the 'Report status to related fogbugz case' action
+    * Make your build parametrized, and include 'CASE_ID' (and optionally REPO_SUBDIR for MultiSCM) string parameters.
+    * (Optional) If you use Multi-SCM, make your repository to merge on have $REPO_SUBDIR as path to checkout in. 
+      Do not use '$REPO_SUBDIR' literally as the MultiSCM subfolder parameter. This will not work. Just make sure the two are the same.
+    * (Optional) set a build name like this: 'Case ${ENV, var="CASE_ID"} - Branch ${ENV, var="NODE_ID"} || Build #${BUILD_NUMBER}'
+    * Ensure you have the following build steps in this order:
+        * Add the 'Perform Gatekeepering' step and check the checkbox
+        * Add your build and tests steps
+        * Add the 'Perform Upmerging of release branches' step
+        * Add the 'Perform a Mercurial Push command' step
+    * Under post-build actions add:
+        * Add the 'Add fogbugz link to case on build page' action
+        * Add the 'Report status to related fogbugz case' action
 
 
 Contact

diff --git a/UpmergePlugin/pom.xml b/UpmergePlugin/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>org.paylogic</groupId>
   <artifactId>UpmergePlugin</artifactId>
-  <version>1.0.20</version>
+  <version>1.0.21</version>
   <packaging>hpi</packaging>
 
   <dependencies>
@@ -25,7 +25,7 @@
       <dependency>
           <groupId>org.paylogic</groupId>
           <artifactId>FogbugzPlugin</artifactId>
-          <version>1.0.20</version>
+          <version>1.0.21</version>
       </dependency>
       <dependency>
           <groupId>org.projectlombok</groupId>
@@ -40,12 +40,12 @@
       <dependency>
           <groupId>org.paylogic</groupId>
           <artifactId>AdvancedMercurial</artifactId>
-          <version>1.0.20</version>
+          <version>1.0.21</version>
       </dependency>
       <dependency>
           <groupId>org.paylogic</groupId>
           <artifactId>GatekeeperPlugin</artifactId>
-          <version>1.0.20</version>
+          <version>1.0.21</version>
       </dependency>
       <dependency>
           <groupId>org.paylogic</groupId>

diff --git a/UpmergePlugin/src/main/java/org/paylogic/jenkins/upmerge/UpmergeBuilder.java b/UpmergePlugin/src/main/java/org/paylogic/jenkins/upmerge/UpmergeBuilder.java
@@ -53,7 +53,7 @@ public UpmergeBuilder(boolean run_always) {
      * Here we should do upmerging.
      *
      * So:
-     * - Fetch case info using branch name.
+     * - Fetch case info using CASE_ID parameter (should be given).
      * - NOT !! Create 'ReleaseBranch' object from case info and a nextBranch object which is releasebranch.copy().next();
      * - Create ReleaseBranch object from current branch, we may expect that the GatekeeperPlugin set the correct one.
      * - Initiate UpMerge sequence....
-Original file line number
+Diff line change
@@ Expand Up @@
             }
             this.executor = new ExecutionHelper(launcher, listener, this.build.getEnvVars(),
-                    new FilePath(new File(this.build.getWorkspace() + givenRepoSubdir)));
+                    new FilePath(new File(this.build.getWorkspace().toString(), givenRepoSubdir)));
         }
         /**
@@ Expand Down @@