No routing policies to for tester applications

2 files changed, 3 insertions, 10 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index f3368d0918b..df0c727ec24 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -517,7 +517,8 @@ public class ApplicationController {
         } finally {
             // Even if prepare fails, a load balancer may have been provisioned. Always refresh routing policies so that
             // any DNS updates can be propagated as early as possible.
-            controller.routing().policies().refresh(application, applicationPackage.deploymentSpec(), zone);
+            if ( ! application.instance().isTester())
+                controller.routing().policies().refresh(application, applicationPackage.deploymentSpec(), zone);
         }
     }
 
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 6ba8ad5bf36..ebda767d79e 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
@@ -578,16 +578,8 @@ public class JobController {
                });
     }
 
-    // TODO(mpolden): Eliminate duplication in this and ApplicationController#deactivate
     public void deactivateTester(TesterId id, JobType type) {
-        var zone = type.zone(controller.system());
-        try {
-            controller.serviceRegistry().configServer().deactivate(new DeploymentId(id.id(), zone));
-        } finally {
-            // Passing an empty DeploymentSpec here is fine as it's used for registering global endpoint names, and
-            // tester instances have none.
-            controller.routing().policies().refresh(id.id(), DeploymentSpec.empty, zone);
-        }
+        controller.serviceRegistry().configServer().deactivate(new DeploymentId(id.id(), type.zone(controller.system())));
     }
 
     private void prunePackages(TenantAndApplicationId id) {