Add methods for deleting all packages of an application

2 files changed, 12 insertions, 0 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
index 2980f008d9f..ec9f9c30e9b 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
@@ -301,6 +301,8 @@ public class JobController {
                                    deactivateTester(TesterId.of(id), type);
                                    curator.deleteRunData(id, type);
                                    logs.delete(id);
+                                   controller.applications().applicationStore().removeAll(id);
+                                   controller.applications().applicationStore().removeAll(TesterId.of(id));
                                }
                            });
                    }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ApplicationStoreMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ApplicationStoreMock.java
index f4615a0d598..f24dba50083 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ApplicationStoreMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ApplicationStoreMock.java
@@ -42,6 +42,11 @@ public class ApplicationStoreMock implements ApplicationStore {
     }
 
     @Override
+    public void removeAll(ApplicationId application) {
+        store.remove(application);
+    }
+
+    @Override
     public byte[] getTesterPackage(TesterId tester, ApplicationVersion applicationVersion) {
         return requireNonNull(store.get(tester.id()).get(applicationVersion));
     }
@@ -58,4 +63,9 @@ public class ApplicationStoreMock implements ApplicationStore {
                && store.get(tester.id()).keySet().removeIf(version -> version.compareTo(oldestToRetain) < 0);
     }
 
+    @Override
+    public void removeAll(TesterId tester) {
+        store.remove(tester.id());
+    }
+
 }