Add testrunner components only for application container clusters

2 files changed, 8 insertions, 8 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
index e9db64f8e4b..73a401e6a2a 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
@@ -11,6 +11,7 @@ import com.yahoo.container.BundlesConfig;
 import com.yahoo.jdisc.http.ServletPathsConfig;
 import com.yahoo.vespa.config.search.RankProfilesConfig;
 import com.yahoo.vespa.config.search.core.RankingConstantsConfig;
+import com.yahoo.vespa.defaults.Defaults;
 import com.yahoo.vespa.model.container.component.Component;
 import com.yahoo.vespa.model.container.component.ConfigProducerGroup;
 import com.yahoo.vespa.model.container.component.Servlet;
@@ -19,6 +20,7 @@ import com.yahoo.vespa.model.container.jersey.RestApi;
 import com.yahoo.vespa.model.utils.FileSender;
 import edu.umd.cs.findbugs.annotations.NonNull;
 
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashSet;
@@ -60,6 +62,7 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
         addSimpleComponent("com.yahoo.container.jdisc.SecretStoreProvider");
         addSimpleComponent("com.yahoo.container.jdisc.DeprecatedSecretStoreProvider");
         addSimpleComponent("com.yahoo.container.jdisc.CertificateStoreProvider");
+        addTestrunnerComponentsIfTester(deployState);
     }
 
     @Override
@@ -86,6 +89,11 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
         }
     }
 
+    private void addTestrunnerComponentsIfTester(DeployState deployState) {
+        if (deployState.isHosted() && deployState.getProperties().applicationId().instance().isTester())
+            addPlatformBundle(Paths.get(Defaults.getDefaults().underVespaHome("lib/jars/vespa-testrunner-components-jar-with-dependencies.jar")));
+    }
+
     public void setModelEvaluation(ContainerModelEvaluation modelEvaluation) {
         this.modelEvaluation = modelEvaluation;
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
index 7a6b1064b24..47adac637ee 100755
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
@@ -37,7 +37,6 @@ import com.yahoo.search.config.QrStartConfig;
 import com.yahoo.search.pagetemplates.PageTemplatesConfig;
 import com.yahoo.search.query.profile.config.QueryProfilesConfig;
 import com.yahoo.vespa.configdefinition.IlscriptsConfig;
-import com.yahoo.vespa.defaults.Defaults;
 import com.yahoo.vespa.model.PortsMeta;
 import com.yahoo.vespa.model.Service;
 import com.yahoo.vespa.model.admin.monitoring.Monitoring;
@@ -64,7 +63,6 @@ import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
 
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -192,7 +190,6 @@ public abstract class ContainerCluster<CONTAINER extends Container>
         addSimpleComponent("com.yahoo.container.handler.VipStatus");
         addSimpleComponent(com.yahoo.container.handler.ClustersStatus.class.getName());
         addJaxProviders();
-        addTestrunnerComponentsIfTester(deployState);
     }
 
     public void setZone(Zone zone) {
@@ -207,11 +204,6 @@ public abstract class ContainerCluster<CONTAINER extends Container>
         addVipHandler();
     }
 
-    private void addTestrunnerComponentsIfTester(DeployState deployState) {
-        if (deployState.isHosted() && deployState.getProperties().applicationId().instance().isTester())
-            addPlatformBundle(Paths.get(Defaults.getDefaults().underVespaHome("lib/jars/vespa-testrunner-components-jar-with-dependencies.jar")));
-    }
-
     public final void addDefaultHandlersExceptStatus() {
         addDefaultRootHandler();
         addMetricStateHandler();