Merge lp:~thomas-voss/jenkins.pbuilder.plugin/fix-973101 into lp:~thomas-voss/jenkins.pbuilder.plugin/trunk

[Thomas Voß]

[Martin Mrazik (mrazik)]

Looks good to me.

review: Approve

=== modified file 'src/main/java/com/ubuntu/builder/HelloWorldBuilder.java'
--- src/main/java/com/ubuntu/builder/HelloWorldBuilder.java	2012-03-22 11:09:35 +0000
+++ src/main/java/com/ubuntu/builder/HelloWorldBuilder.java	2012-04-04 08:47:19 +0000
@@ -64,6 +64,7 @@
   private final String pbuilderSetupBranch;
   private final String mainBranch;
   private final String packagingBranch;
+  private final boolean chrootedBuild;
   private final String workDirectory;
   private final String resultsDirectory;
   // Fields in config.jelly must match the parameter names in the "DataBoundConstructor"
@@ -71,6 +72,7 @@
   public HelloWorldBuilder(String pbuilderSetupBranch,
                            String mainBranch,
                            String packagingBranch,
+                           boolean chrootedBuild,
                            String workDirectory,
                            String resultsDirectory) {
 
@@ -80,6 +82,7 @@
 	
     this.workDirectory = workDirectory;
     this.resultsDirectory = resultsDirectory;
+    this.chrootedBuild = chrootedBuild;
     this.name = null;
   }
 
@@ -102,6 +105,14 @@
     return packagingBranch;
   }
 
+  public boolean IsChrootedBuild() {
+    return chrootedBuild;
+  }
+
+  public boolean GetChrootedBuild() {
+    return chrootedBuild;
+  }
+  
   public String getWorkDirectory() {
     return workDirectory;
   }
@@ -120,8 +131,9 @@
     try {
       envVars = build.getEnvironment(listener);
     } catch(Exception e) {
-      listener.getLogger().println("Problem getting build env: " + envVars);    
+      listener.getLogger().println("Problem getting build env: " + e);    
     }
+    
     String psb = pbuilderSetupBranch;
     String mb = mainBranch;
     String pb = packagingBranch;
@@ -158,21 +170,6 @@
         listener.getLogger().println("Problem branching or updating pbuilder setup.");
         return false;
       }
-      // Get the pbuilder setup
-      /*if(launcher.launch().
-        cmds("bzr",
-        "checkout",
-        pbuilderSetupBranch,
-        build.getWorkspace().child(this.CHECKOUT_DIRECTORY).toString()).
-        stdout(listener.getLogger()).
-        stderr(listener.getLogger()).
-        pwd(build.getWorkspace()).
-        join() != this.EXIT_SUCCESS) {
-        
-        listener.getLogger().println("Problem branching pbuilder setup ... aborting.");
-        return false;
-        }*/
-
       if(launcher.launch().
          cmds("sudo",
               "./Builder.sh",
@@ -181,17 +178,18 @@
               "-h",
               "./hooks",
               "-r",
-              resultDir.toString(),//"../results",
+              resultDir.toString(),
               "-m",
               mb,
               "-p",
-              pb).
+              pb,
+              chrootedBuild ? "-c" : "").
          pwd(build.getWorkspace() + "/pbuilder_setup").
          stdout(listener.getLogger()).
          stderr(listener.getLogger()).
          join() != this.EXIT_SUCCESS) {
 
-        listener.getLogger().println("Problem invoking pbuilder ... aborting.");
+        listener.getLogger().println("pbuilder returned ERROR.");
         return false;
       }
       
@@ -213,26 +211,33 @@
     int exitCode = -1;
     
     if(pbuilderSetupDir.exists()) {
-      exitCode = launcher.launch().
+      /*exitCode = launcher.launch().
           cmds("bzr",
                "pull",
                branch).          
           stdout(listener.getLogger()).
           stderr(listener.getLogger()).
           pwd(pbuilderSetupDir).
-          join();
-    } else {
-      exitCode = launcher.launch().
-          cmds("bzr",
-               "checkout",
-               branch,
-               pbuilderSetupDir.toString()).
-          stdout(listener.getLogger()).
-          stderr(listener.getLogger()).
-          pwd(build.getWorkspace()).
-          join();
+          join();*/
+
+      try {
+        pbuilderSetupDir.deleteRecursive();
+      } catch(Exception e) {
+        listener.getLogger().println("Problem deleting pbuilder setup dir: " + e);
+        return false;
+      }      
     }
-
+    
+    exitCode = launcher.launch().
+        cmds("bzr",
+             "checkout",
+             branch,
+             pbuilderSetupDir.toString()).
+        stdout(listener.getLogger()).
+        stderr(listener.getLogger()).
+        pwd(build.getWorkspace()).
+        join();
+       
     return exitCode == EXIT_SUCCESS;
   }
   
@@ -255,15 +260,6 @@
   @Extension // This indicates to Jenkins that this is an implementation of an extension point.
   public static final class DescriptorImpl extends BuildStepDescriptor<Builder> {
     /**
-     * To persist global configuration information,
-     * simply store it in a field and call save().
-     *
-     * <p>
-     * If you don't want fields to be persisted, use <tt>transient</tt>.
-     */
-    private boolean useFrench;
-
-    /**
      * Performs on-the-fly validation of the form field 'name'.
      *
      * @param value
@@ -353,21 +349,9 @@
 
     @Override
         public boolean configure(StaplerRequest req, JSONObject formData) throws FormException {
-      // To persist global configuration information,
-      // set that to properties and call save().
-      useFrench = formData.getBoolean("useFrench");
-      // ^Can also use req.bindJSON(this, formData);
-      //  (easier when there are many fields; need set* methods for this, like setUseFrench)
-      save();
       return super.configure(req,formData);
     }
 
-    /**
-     * This method returns true if the global configuration says we should speak French.
-     */
-    public boolean useFrench() {
-      return useFrench;
-    }
   }
 }
 
 
=== modified file 'src/main/resources/com/ubuntu/builder/HelloWorldBuilder/config.jelly'
--- src/main/resources/com/ubuntu/builder/HelloWorldBuilder/config.jelly	2012-02-14 13:09:11 +0000
+++ src/main/resources/com/ubuntu/builder/HelloWorldBuilder/config.jelly	2012-04-04 08:47:19 +0000
@@ -19,6 +19,9 @@
     <f:textbox />
   </f:entry>
   <f:optionalBlock title="Advanced Options" inline="true">
+  <f:entry title="Build in a chroot'ed environment" field="chrootedBuild">
+    <f:checkbox value="false"/>
+  </f:entry>
   <f:entry title="Work Directory" field="workDirectory">
     <f:textbox value="work"/>
   </f:entry>