diff --git a/perfkitbenchmarker/benchmark_spec.py b/perfkitbenchmarker/benchmark_spec.py index 67f018267..26b5f1a69 100644 --- a/perfkitbenchmarker/benchmark_spec.py +++ b/perfkitbenchmarker/benchmark_spec.py @@ -1244,6 +1244,11 @@ def Delete(self): 'Got an exception deleting CapacityReservations. ' 'Attempting to continue tearing down.' ) + if self.managed_vm_groups: + background_tasks.RunThreaded( + lambda vm_group: vm_group.Delete(), + list(self.managed_vm_groups.values()) + ) if self.vms: try: diff --git a/perfkitbenchmarker/linux_benchmarks/provisioning_benchmarks/provision_and_scale_managed_vm_group_benchmark.py b/perfkitbenchmarker/linux_benchmarks/provisioning_benchmarks/provision_and_scale_managed_vm_group_benchmark.py index 7d742253b..68680e138 100644 --- a/perfkitbenchmarker/linux_benchmarks/provisioning_benchmarks/provision_and_scale_managed_vm_group_benchmark.py +++ b/perfkitbenchmarker/linux_benchmarks/provisioning_benchmarks/provision_and_scale_managed_vm_group_benchmark.py @@ -52,7 +52,6 @@ managed_spec: {} flags: skip_vm_preparation: true - collect_delete_samples: true """ diff --git a/perfkitbenchmarker/providers/gcp/gce_managed_instance_group.py b/perfkitbenchmarker/providers/gcp/gce_managed_instance_group.py index 78484fb07..f49b8c924 100644 --- a/perfkitbenchmarker/providers/gcp/gce_managed_instance_group.py +++ b/perfkitbenchmarker/providers/gcp/gce_managed_instance_group.py @@ -79,9 +79,6 @@ def _Create(self): def _Delete(self): cmd = self._GcloudCmd( - self, - 'compute', - 'instance-templates', 'delete', self.name, '--region',