Merge remote-tracking branch 'origin/master' into workspace-override

Author: raydouglass

src/main/java/com/gpuopenanalytics/jenkins/remotedocker/DockerLauncher.java

@@ -162,6 +162,7 @@ private ArgumentListBuilder getlaunchArgs(DockerConfiguration config,
         //TODO Set name? Maybe with build.toString().replaceAll("^\\w", "_")
         ArgumentListBuilder args = new ArgumentListBuilder()
                 .add("run", "-t", "-d")
+                .add("--name", Utils.resolveVariables(this, "$BUILD_TAG"))
                 //Add bridge network for internet access
                 .add("--network", "bridge");
         //Add inter-container network if needed
@@ -299,11 +300,14 @@ public Proc dockerExec(Launcher.ProcStarter starter,
      * @throws IOException
      * @throws InterruptedException
      */
-    public void tearDown() throws IOException, InterruptedException {
-        boolean exception = false;
+    public void tearDown(boolean removeContainers) throws IOException, InterruptedException {
         for (String containerId : containerIds) {
-            ArgumentListBuilder args = new ArgumentListBuilder()
-                    .add("rm", "-f", containerId);
+            ArgumentListBuilder args = new ArgumentListBuilder();
+            if (removeContainers) {
+                args.add("rm", "-f", containerId);
+            } else {
+                args.add("stop", containerId);
+            }
 
             ByteArrayOutputStream out = new ByteArrayOutputStream();
             int status = executeCommand(args)
@@ -312,7 +316,9 @@ public void tearDown() throws IOException, InterruptedException {
                     .join();
 
             if (status != 0) {
-                listener.error("Failed to remove container %s", containerId);
+                listener.error("Failed to %s container %s",
+                               removeContainers ? "remove" : "stop",
+                               containerId);
             }
         }
         if (network.isPresent()) {

src/main/java/com/gpuopenanalytics/jenkins/remotedocker/RemoteDockerBuildWrapper.java

@@ -41,6 +41,7 @@
 import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
 import org.kohsuke.stapler.DataBoundConstructor;
+import org.kohsuke.stapler.DataBoundSetter;
 import org.kohsuke.stapler.StaplerRequest;
 
 import java.io.IOException;
@@ -61,6 +62,7 @@ public class RemoteDockerBuildWrapper extends BuildWrapper {
 
     private boolean debug;
     private String workspaceOverride;
+    private Boolean removeContainers = true;
     private AbstractDockerConfiguration dockerConfiguration;
     private List<SideDockerConfiguration> sideDockerConfigurations;
 
@@ -86,6 +88,15 @@ public String getWorkspaceOverride() {
         return workspaceOverride;
     }
 
+    @DataBoundSetter
+    public void setRemoveContainers(Boolean removeContainers) {
+        this.removeContainers = removeContainers;
+    }
+
+    public Boolean isRemoveContainers() {
+        return removeContainers != null ? removeContainers : true;
+    }
+
     public AbstractDockerConfiguration getDockerConfiguration() {
         return dockerConfiguration;
     }
@@ -117,13 +128,13 @@ public Environment setUp(AbstractBuild build,
         build.addAction(new DockerAction());
         try {
             ((DockerLauncher) launcher).launchContainers();
-            return new DockerEnvironment((DockerLauncher) launcher);
+            return new DockerEnvironment((DockerLauncher) launcher,
+                                         removeContainers);
         } catch (IOException | InterruptedException e) {
             //Attempt tearDown in case we partially started some containers
-            ((DockerLauncher) launcher).tearDown();
+            ((DockerLauncher) launcher).tearDown(true);
             throw e;
         }
-
     }
 
     /**
@@ -132,15 +143,18 @@ public Environment setUp(AbstractBuild build,
     private class DockerEnvironment extends BuildWrapper.Environment {
 
         private DockerLauncher launcher;
+        private boolean removeContainers;
 
-        public DockerEnvironment(DockerLauncher launcher) {
+        public DockerEnvironment(DockerLauncher launcher,
+                                 boolean removeContainers) {
             this.launcher = launcher;
+            this.removeContainers = removeContainers;
         }
 
         @Override
         public boolean tearDown(AbstractBuild build,
                                 BuildListener listener) throws IOException, InterruptedException {
-            this.launcher.tearDown();
+            this.launcher.tearDown(removeContainers);
             return true;
         }
     }

src/main/java/com/gpuopenanalytics/jenkins/remotedocker/job/DockerImageConfiguration.java

@@ -88,10 +88,8 @@ public void setupImage(DockerLauncher launcher,
             String image = Utils.resolveVariables(launcher, getImage());
             args.add("docker", "pull", image);
             Launcher.ProcStarter proc = launcher.executeCommand(args)
-                    .stderr(launcher.getListener().getLogger());
-            if (launcher.isDebug()) {
-                proc = proc.stdout(launcher.getListener());
-            }
+                    .stderr(launcher.getListener().getLogger())
+                    .stdout(launcher.getListener());
             int status = proc.join();
             if (status != 0) {
                 throw new IOException("Could not pull image: " + image);

src/main/resources/com/gpuopenanalytics/jenkins/remotedocker/RemoteDockerBuildWrapper/config.jelly

@@ -37,6 +37,9 @@
             <f:repeatableDeleteButton/>
         </f:repeatableProperty>
     </f:entry>
+    <f:entry title="Remove containers" field="removeContainers">
+        <f:checkbox default="true"/>
+    </f:entry>
     <f:entry title="Debug" field="debug">
         <f:checkbox/>
     </f:entry>

src/main/resources/com/gpuopenanalytics/jenkins/remotedocker/RemoteDockerBuildWrapper/help-removeContainers.html

@@ -0,0 +1,26 @@
+<!--
+  ~ The MIT License
+  ~
+  ~ Copyright (c) 2019, NVIDIA CORPORATION.
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
+  ~ of this software and associated documentation files (the "Software"), to deal
+  ~ in the Software without restriction, including without limitation the rights
+  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  ~ copies of the Software, and to permit persons to whom the Software is
+  ~ furnished to do so, subject to the following conditions:
+  ~
+  ~ The above copyright notice and this permission notice shall be included in
+  ~ all copies or substantial portions of the Software.
+  ~
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  ~ THE SOFTWARE.
+  -->
+<div>
+    Whether the containers should be removed (<code>docker rm</code>) when the job completes.
+</div>