Skip to content

Commit 9ba5434

Browse files
authored
Merge pull request #6069 from gchq/5990-stop-pausing-instance-in-teardown
Issue 5990 - Stop pausing instance during teardown
2 parents 06f7437 + 586f14a commit 9ba5434

File tree

2 files changed

+0
-7
lines changed

2 files changed

+0
-7
lines changed

java/clients/src/main/java/sleeper/clients/teardown/TearDownInstance.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import org.slf4j.Logger;
1919
import org.slf4j.LoggerFactory;
2020

21-
import sleeper.clients.deploy.AwsScheduleRules;
2221
import sleeper.clients.util.ClientUtils;
2322
import sleeper.core.properties.instance.InstanceProperties;
2423
import sleeper.core.properties.local.LoadLocalProperties;
@@ -66,7 +65,6 @@ public void tearDown() throws IOException, InterruptedException {
6665
LOGGER.info("scriptsDir: {}", scriptsDir);
6766
LOGGER.info("{}: {}", ID.getPropertyName(), instanceId);
6867

69-
shutdownSystemProcesses();
7068
deleteStack();
7169
waitForStackToDelete();
7270
deleteArtefactsStack();
@@ -76,10 +74,6 @@ public void tearDown() throws IOException, InterruptedException {
7674
LOGGER.info("Finished tear down");
7775
}
7876

79-
public void shutdownSystemProcesses() throws InterruptedException {
80-
new AwsScheduleRules(clients.getCloudWatch()).pauseInstance(instanceId);
81-
}
82-
8377
public void deleteStack() {
8478
deleteStack(instanceId);
8579
}

java/system-test/system-test-drivers/src/main/java/sleeper/systemtest/drivers/cdk/TearDownMavenSystemTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ public static void tearDown(
6363
List<TearDownInstance> tearDownAllInstances = Stream.concat(tearDownMavenInstances.stream(), tearDownStandaloneInstances.stream()).collect(toUnmodifiableList());
6464

6565
for (TearDownInstance instance : tearDownAllInstances) {
66-
instance.shutdownSystemProcesses();
6766
instance.deleteStack();
6867
}
6968
for (TearDownInstance instance : tearDownMavenInstances) {

0 commit comments

Comments
 (0)