jenkinsci · benjsc · Apr 6, 2012 · Sep 15, 2012 · Sep 15, 2012 · Sep 18, 2012
diff --git a/README.md b/README.md
@@ -0,0 +1,23 @@
+VirtualBox Plugin
+=================
+
+This plugin manage slaves using VirtualBox vms with its WebServer API.
+
+Sources
+-------
+
+If you're wanting to make changes, please clone the git repository at [sources]
+
+git://github.com/jenkinsci/virtualbox-plugin.git
+
+Documentation
+-------------
+
+Plugin Wiki page [wikipage]
+
+
+[ButlerImage]: http://jenkins-ci.org/sites/default/files/jenkins_logo.png
+[website]: http://jenkins-ci.org
+[wikipage]: https://wiki.jenkins-ci.org/display/JENKINS/VirtualBox+Plugin
+[sources]: https://github.com/jenkinsci/virtualbox-plugin
+
diff --git a/README.txt b/README.txt
@@ -1,28 +1,5 @@
-This is an experimental branch for Virtualbox Snapshot testing.
+git://github.com/jenkinsci/virtualbox-plugin.git
 
+Wiki page at 
 
-If you create a snapshot in a virtual machine this snapshot will be listed in the Jenkins node configuration at the Virtual Machine Name as <machineName>//<Snapshot>. It is also possible to create snapshot trees. In this case the Virtual Machine Name is build as <machineName>//<Snapshot>/<Snapshot2>.
-
-When the virtualbox-plugin starts and stops the virtual machine the selected snapshot is restored. This allows you to setup a virtual machine in a defined statewith e.g. test data.
-
-Note: An error will be caused, if the virtual machine is relaunched while it already runs. Therefore the virtual machine has to be stopped (maybe the plugin can do this in one of the next releases). To avoid this, set the Availability in the Jenkins node configuration to 'Take this slave on-line when in demand and off-line when idle', 'In demand delay' and 'Idle delay' to 1, and add a label which is also used for the build job definition. Jenkins will start the virtual machine when the build job is started and stops the virtual machine (the plugin will also restore the virtual machine).
-
-
-Note: Snapshots are implemented for Virtualbox 4.0 and 4.1. Version 3.x isn't supported (at the moment).
-
-
-----
-
-Some 'git stuff' for this branch:
-
-
-git clone https://github.com/jenkinsci/virtualbox-plugin.git
-## or git pull
-
-git branch -r
-## shows remote branch origin/snap
-
-git branch --track snap origin/snap
-## tracks the (see also ################################################################################)
-
-git checkout snap
+https://wiki.jenkins-ci.org/display/JENKINS/VirtualBox+Plugin
diff --git a/client/pom.xml b/client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>virtualbox-parent</artifactId>
-    <version>0.5-SNAPSHOT</version>
+    <version>0.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/lib/org/virtualbox/readme.txt b/lib/org/virtualbox/readme.txt
@@ -8,3 +8,26 @@ mvn deploy:deploy-file
     -Dfile=/PATH_TO_DOWNLOADED_JAR/vboxjws-4.1.8.jar
     -Durl=file:/PATH_TO_PLUGIN_SOURCES/virtualbox-plugin/plugin/../lib
     -DrepositoryId=virtualbox-libs
+
+
+Command used to install vboxws.jar version 4.2.0 to local repository:
+
+mvn deploy:deploy-file
+    -DgroupId=org.virtualbox
+    -DartifactId=vboxws-42
+    -Dversion=4.2.0
+    -Dpackaging=jar
+    -Dfile=/PATH_TO_DOWNLOADED_JAR/vboxjws-4.2.0.jar
+    -Durl=file:/PATH_TO_PLUGIN_SOURCES/virtualbox-plugin/plugin/../lib
+    -DrepositoryId=virtualbox-libs
+
+Command used to install vboxws.jar version 4.3.0 to local repository:
+
+mvn deploy:deploy-file
+    -DgroupId=org.virtualbox
+    -DartifactId=vboxws-43
+    -Dversion=4.3.0
+    -Dpackaging=jar
+    -Dfile=/PATH_TO_DOWNLOADED_JAR/vboxjws-4.3.0.jar
+    -Durl=file:/PATH_TO_PLUGIN_SOURCES/virtualbox-plugin/plugin/../lib
+    -DrepositoryId=virtualbox-libs
diff --git a/lib/org/virtualbox/vboxws-42/4.2.0/vboxws-42-4.2.0.jar b/lib/org/virtualbox/vboxws-42/4.2.0/vboxws-42-4.2.0.jar
diff --git a/lib/org/virtualbox/vboxws-42/4.2.0/vboxws-42-4.2.0.jar.md5 b/lib/org/virtualbox/vboxws-42/4.2.0/vboxws-42-4.2.0.jar.md5
@@ -0,0 +1 @@
+c884629596f4eda162c9f412dadd8321
diff --git a/lib/org/virtualbox/vboxws-42/4.2.0/vboxws-42-4.2.0.jar.sha1 b/lib/org/virtualbox/vboxws-42/4.2.0/vboxws-42-4.2.0.jar.sha1
@@ -0,0 +1 @@
+24ba74a8b017e479a24cf0a695ec6442be519798
diff --git a/lib/org/virtualbox/vboxws-42/4.2.0/vboxws-42-4.2.0.pom b/lib/org/virtualbox/vboxws-42/4.2.0/vboxws-42-4.2.0.pom
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.virtualbox</groupId>
+  <artifactId>vboxws-42</artifactId>
+  <version>4.2.0</version>
+</project>
diff --git a/lib/org/virtualbox/vboxws-42/4.2.0/vboxws-42-4.2.0.pom.md5 b/lib/org/virtualbox/vboxws-42/4.2.0/vboxws-42-4.2.0.pom.md5
@@ -0,0 +1 @@
+d26aa718e5d01f71fa916af6d7c21b65
diff --git a/lib/org/virtualbox/vboxws-42/4.2.0/vboxws-42-4.2.0.pom.sha1 b/lib/org/virtualbox/vboxws-42/4.2.0/vboxws-42-4.2.0.pom.sha1
@@ -0,0 +1 @@
+3dbb8214e83dd58e45a3443c9fab94de3695bc24
diff --git a/lib/org/virtualbox/vboxws-42/maven-metadata.xml b/lib/org/virtualbox/vboxws-42/maven-metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.virtualbox</groupId>
+  <artifactId>vboxws-42</artifactId>
+  <versioning>
+    <release>4.2.0</release>
+    <versions>
+      <version>4.2.0</version>
+    </versions>
+    <lastUpdated>20120915115604</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/lib/org/virtualbox/vboxws-42/maven-metadata.xml.md5 b/lib/org/virtualbox/vboxws-42/maven-metadata.xml.md5
@@ -0,0 +1 @@
+799bb16aba4aff40834def6e0933815d
diff --git a/lib/org/virtualbox/vboxws-42/maven-metadata.xml.sha1 b/lib/org/virtualbox/vboxws-42/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+d347676b8b35c43bf53f7321e4f19f9ce2f95577
diff --git a/lib/org/virtualbox/vboxws-43/4.3.0/vboxws-43-4.3.0.jar b/lib/org/virtualbox/vboxws-43/4.3.0/vboxws-43-4.3.0.jar
diff --git a/lib/org/virtualbox/vboxws-43/4.3.0/vboxws-43-4.3.0.jar.md5 b/lib/org/virtualbox/vboxws-43/4.3.0/vboxws-43-4.3.0.jar.md5
@@ -0,0 +1 @@
+589d48ae7b4d7e981164ad6de80d456b
diff --git a/lib/org/virtualbox/vboxws-43/4.3.0/vboxws-43-4.3.0.jar.sha1 b/lib/org/virtualbox/vboxws-43/4.3.0/vboxws-43-4.3.0.jar.sha1
@@ -0,0 +1 @@
+4639673004fadf186fa033e01ca662923221d4b0
diff --git a/lib/org/virtualbox/vboxws-43/4.3.0/vboxws-43-4.3.0.pom b/lib/org/virtualbox/vboxws-43/4.3.0/vboxws-43-4.3.0.pom
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.virtualbox</groupId>
+  <artifactId>vboxws-43</artifactId>
+  <version>4.3.0</version>
+</project>
diff --git a/lib/org/virtualbox/vboxws-43/4.3.0/vboxws-43-4.3.0.pom.md5 b/lib/org/virtualbox/vboxws-43/4.3.0/vboxws-43-4.3.0.pom.md5
@@ -0,0 +1 @@
+8469c434998c1edead34ab7a44dca8f5
diff --git a/lib/org/virtualbox/vboxws-43/4.3.0/vboxws-43-4.3.0.pom.sha1 b/lib/org/virtualbox/vboxws-43/4.3.0/vboxws-43-4.3.0.pom.sha1
@@ -0,0 +1 @@
+55747744528d742cefb6b4f623f81220e042f6df
diff --git a/lib/org/virtualbox/vboxws-43/maven-metadata.xml b/lib/org/virtualbox/vboxws-43/maven-metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.virtualbox</groupId>
+  <artifactId>vboxws-43</artifactId>
+  <versioning>
+    <release>4.3.0</release>
+    <versions>
+      <version>4.3.0</version>
+    </versions>
+    <lastUpdated>20131016142905</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/lib/org/virtualbox/vboxws-43/maven-metadata.xml.md5 b/lib/org/virtualbox/vboxws-43/maven-metadata.xml.md5
@@ -0,0 +1 @@
+f99be82d08cfba9f59c01be24819ecd8
diff --git a/lib/org/virtualbox/vboxws-43/maven-metadata.xml.sha1 b/lib/org/virtualbox/vboxws-43/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+c69fe4411a3198e238e3252fd65c9e55438b812b
diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>virtualbox-parent</artifactId>
-    <version>0.5-SNAPSHOT</version>
+    <version>0.8-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -26,11 +26,21 @@
       <artifactId>vboxws-40</artifactId>
       <version>4.0.8</version>
     </dependency>
-    <dependency>
-      <groupId>org.virtualbox</groupId>
-      <artifactId>vboxws-41</artifactId>
-      <version>4.1.8</version>
-    </dependency>
+      <dependency>
+          <groupId>org.virtualbox</groupId>
+          <artifactId>vboxws-41</artifactId>
+          <version>4.1.8</version>
+      </dependency>
+      <dependency>
+          <groupId>org.virtualbox</groupId>
+          <artifactId>vboxws-42</artifactId>
+          <version>4.2.0</version>
+      </dependency>
+      <dependency>
+          <groupId>org.virtualbox</groupId>
+          <artifactId>vboxws-43</artifactId>
+          <version>4.3.0</version>
+      </dependency>
   </dependencies>
 
   <repositories>

diff --git a/plugin/src/main/java/hudson/plugins/virtualbox/VirtualBoxBuildWrapper.java b/plugin/src/main/java/hudson/plugins/virtualbox/VirtualBoxBuildWrapper.java
@@ -32,7 +32,7 @@ class EnvironmentImpl extends Environment {
       public boolean tearDown(AbstractBuild build, BuildListener listener) throws IOException, InterruptedException {
         VirtualBoxMachine machine = VirtualBoxPlugin.getVirtualBoxMachine(getHostName(), getVirtualMachineName());
         listener.getLogger().println(Messages.VirtualBoxLauncher_stopVM(machine));
-        VirtualBoxUtils.stopVm(machine, new VirtualBoxTaskListenerLog(listener, "[VirtualBox] "));
+        VirtualBoxUtils.stopVm(machine, "pause", new VirtualBoxTaskListenerLog(listener, "[VirtualBox] "));
         return true;
       }
     }

diff --git a/plugin/src/main/java/hudson/plugins/virtualbox/VirtualBoxComputerLauncher.java b/plugin/src/main/java/hudson/plugins/virtualbox/VirtualBoxComputerLauncher.java
@@ -1,9 +1,12 @@
 package hudson.plugins.virtualbox;
 
+import org.kohsuke.stapler.DataBoundConstructor;
+
 import hudson.model.Descriptor;
 import hudson.model.TaskListener;
 import hudson.slaves.ComputerLauncher;
 import hudson.slaves.SlaveComputer;
+
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -24,26 +27,36 @@ public class VirtualBoxComputerLauncher extends ComputerLauncher {
 
   private ComputerLauncher delegate;
 
-  /**
-   * @param delegate real user-specified {@link ComputerLauncher}.
-   */
-  public VirtualBoxComputerLauncher(ComputerLauncher delegate) {
+  private String hostName;
+
+  private String virtualMachineName;
+
+  private String virtualMachineType;
+
+  private String virtualMachineStopMode;
+
+  @DataBoundConstructor
+  public VirtualBoxComputerLauncher(ComputerLauncher delegate, String hostName, String virtualMachineName,
+      String virtualMachineType, String virtualMachineStopMode) {
     this.delegate = delegate;
+    this.hostName = hostName;
+    this.virtualMachineName = virtualMachineName;
+    this.virtualMachineType = virtualMachineType;
+    this.virtualMachineStopMode = virtualMachineStopMode;
   }
 
   @Override
   public void launch(SlaveComputer computer, TaskListener listener) throws IOException, InterruptedException {
-    VirtualBoxSlave slave = ((VirtualBoxComputer) computer).getNode();
-    log(listener, "Launching node " + slave.getVirtualMachineName());
+    log(listener, "Launching node " + virtualMachineName);
     try {
       // Connect to VirtualBox host
-      VirtualBoxMachine machine = VirtualBoxPlugin.getVirtualBoxMachine(slave.getHostName(), slave.getVirtualMachineName());
+      VirtualBoxMachine machine = VirtualBoxPlugin.getVirtualBoxMachine(hostName, virtualMachineName);
       if (machine == null) {
         listener.fatalError("Unable to find specified machine");
         return;
       }
       log(listener, Messages.VirtualBoxLauncher_startVM(machine));
-      long result = VirtualBoxUtils.startVm(machine, slave.getVirtualMachineType(), new VirtualBoxTaskListenerLog(listener, "[VirtualBox] "));
+      long result = VirtualBoxUtils.startVm(machine, virtualMachineType, new VirtualBoxTaskListenerLog(listener, "[VirtualBox] "));
       if (result != 0) {
         listener.fatalError("Unable to launch");
         return;
@@ -102,20 +115,19 @@ public void beforeDisconnect(SlaveComputer computer, TaskListener listener) {
 
   @Override
   public void afterDisconnect(SlaveComputer computer, TaskListener listener) {
-    VirtualBoxSlave slave = ((VirtualBoxComputer) computer).getNode();
     // Stage 2 of the afterDisconnect
     log(listener, "Starting stage 2 afterDisconnect");
     getCore().afterDisconnect(computer, listener);
     log(listener, "Stage 2 afterDisconnect completed");
 
     try {
       // Connect to VirtualBox host
-      VirtualBoxMachine machine = VirtualBoxPlugin.getVirtualBoxMachine(slave.getHostName(), slave.getVirtualMachineName());
+      VirtualBoxMachine machine = VirtualBoxPlugin.getVirtualBoxMachine(hostName, virtualMachineName);
       if (machine == null) {
         listener.fatalError("Unable to find specified machine");
       }
       log(listener, Messages.VirtualBoxLauncher_stopVM(machine));
-      long result = VirtualBoxUtils.stopVm(machine, new VirtualBoxTaskListenerLog(listener, "[VirtualBox] "));
+      long result = VirtualBoxUtils.stopVm(machine, virtualMachineStopMode, new VirtualBoxTaskListenerLog(listener, "[VirtualBox] "));
       if (result != 0) {
         listener.fatalError("Unable to stop");
       }

diff --git a/plugin/src/main/java/hudson/plugins/virtualbox/VirtualBoxControl.java b/plugin/src/main/java/hudson/plugins/virtualbox/VirtualBoxControl.java
@@ -7,7 +7,7 @@
  */
 public interface VirtualBoxControl {
   public long startVm(VirtualBoxMachine machine, String virtualMachineType, VirtualBoxLogger log);
-  public long stopVm(VirtualBoxMachine machine, VirtualBoxLogger log);
+  public long stopVm(VirtualBoxMachine machine, String virtualMachineStopMode, VirtualBoxLogger log);
 
   public List<VirtualBoxMachine> getMachines(VirtualBoxCloud host, VirtualBoxLogger log);
   public String getMacAddress(VirtualBoxMachine machine, VirtualBoxLogger log);

diff --git a/plugin/src/main/java/hudson/plugins/virtualbox/VirtualBoxControlV31.java b/plugin/src/main/java/hudson/plugins/virtualbox/VirtualBoxControlV31.java
@@ -103,7 +103,7 @@ public synchronized long startVm(VirtualBoxMachine vbMachine, String type, Virtu
    * @param vbMachine virtual machine to stop
    * @return result code
    */
-  public synchronized long stopVm(VirtualBoxMachine vbMachine, VirtualBoxLogger log) {
+  public synchronized long stopVm(VirtualBoxMachine vbMachine, String stopMode, VirtualBoxLogger log) {
     ConnectionHolder holder = connect(hostUrl, userName, password);
     IMachine machine = holder.vbox.findMachine(vbMachine.getName());
     if (org.virtualbox_3_1.MachineState.RUNNING != machine.getState()) {

diff --git a/plugin/src/main/java/hudson/plugins/virtualbox/VirtualBoxControlV40.java b/plugin/src/main/java/hudson/plugins/virtualbox/VirtualBoxControlV40.java
@@ -207,7 +207,7 @@ public synchronized long startVm(VirtualBoxMachine vbMachine, String type, Virtu
    * @param log
    * @return result code
    */
-  public synchronized long stopVm(VirtualBoxMachine vbMachine, VirtualBoxLogger log) {
+  public synchronized long stopVm(VirtualBoxMachine vbMachine, String stopMode, VirtualBoxLogger log) {
     String machineName = vbMachine.getName();
     String machineId = vbMachine.getMachineId();
     String snapshotId = vbMachine.getSnapshotId();
@@ -252,7 +252,7 @@ public synchronized long stopVm(VirtualBoxMachine vbMachine, VirtualBoxLogger lo
       return -1;
     }
 
-    if (MachineState.Stuck == state) {
+    if (MachineState.Stuck == state || "powerdown".equals(stopMode)) {
       // for Stuck state call powerDown and go to PoweredOff state
       progress = session.getConsole().powerDown();
     } else if (snapshot != null) {

diff --git a/plugin/src/main/java/hudson/plugins/virtualbox/VirtualBoxControlV41.java b/plugin/src/main/java/hudson/plugins/virtualbox/VirtualBoxControlV41.java
@@ -207,7 +207,7 @@ public synchronized long startVm(VirtualBoxMachine vbMachine, String type, Virtu
    * @param log
    * @return result code
    */
-  public synchronized long stopVm(VirtualBoxMachine vbMachine, VirtualBoxLogger log) {
+  public synchronized long stopVm(VirtualBoxMachine vbMachine, String stopMode, VirtualBoxLogger log) {
     String machineName = vbMachine.getName();
     String machineId = vbMachine.getMachineId();
     String snapshotId = vbMachine.getSnapshotId();
@@ -252,7 +252,7 @@ public synchronized long stopVm(VirtualBoxMachine vbMachine, VirtualBoxLogger lo
       return -1;
     }
 
-    if (MachineState.Stuck == state) {
+    if (MachineState.Stuck == state || "powerdown".equals(stopMode)) {
       // for Stuck state call powerDown and go to PoweredOff state
       progress = session.getConsole().powerDown();
     } else if (snapshot != null) {