setupRootDevice (AKA add delete-on-termination to root)

jenkinsci · Sep 6, 2016 · e2da95f · e2da95f
1 parent ee0f919
commit e2da95f
Showing 1 changed file with 23 additions and 0 deletions.
diff --git a/src/main/java/hudson/plugins/ec2/SlaveTemplate.java b/src/main/java/hudson/plugins/ec2/SlaveTemplate.java
@@ -457,6 +457,7 @@ private EC2AbstractSlave provisionOndemand(TaskListener listener, Label required
 
             riRequest.setEbsOptimized(ebsOptimized);
 
+            setupRootDevice(riRequest.getBlockDeviceMappings());
             if (useEphemeralDevices) {
                 setupEphemeralDeviceMapping(riRequest);
             } else {
@@ -627,6 +628,27 @@ private EC2AbstractSlave provisionOndemand(TaskListener listener, Label required
         }
     }
 
+    private void setupRootDevice(List<BlockDeviceMapping> deviceMappings) {
+        if (deleteRootOnTermination && getImage().getRootDeviceType().equals("ebs")) {
+            // Capture all the devices named in the AMI
+            // use this later to ensure we only set flags on root devices
+            // therefore this can be skipped if we guarantee that setupRootDevice is run before all
+            // other mapping related stuff
+            final List<BlockDeviceMapping> rootDeviceMappings = getAmiBlockDeviceMappings();
+            final Set<String> rootDeviceNames = new HashSet<String>();
+            for (final BlockDeviceMapping rootMapping : rootDeviceMappings) {
+                rootDeviceNames.add(rootMapping.getDeviceName());
+            }
+
+            // Go through the mappings in the request, update only the root devices
+            for (final BlockDeviceMapping mapping : deviceMappings) {
+                if (rootDeviceNames.contains(mapping.getDeviceName())) {
+                    mapping.getEbs().setDeleteOnTermination(Boolean.TRUE);
+                }
+            }
+        }
+    }
+
     private List<BlockDeviceMapping> getNewEphemeralDeviceMapping() {
 
         final List<BlockDeviceMapping> oldDeviceMapping = getAmiBlockDeviceMappings();
@@ -808,6 +830,7 @@ private EC2AbstractSlave provisionSpot(TaskListener listener) throws AmazonClien
                 launchSpecification.setIamInstanceProfile(new IamInstanceProfileSpecification().withArn(getIamInstanceProfile()));
             }
 
+            setupRootDevice(launchSpecification.getBlockDeviceMappings());
             if (useEphemeralDevices) {
                 setupEphemeralDeviceMapping(launchSpecification);
             } else {