Load bundle only conditionally

1 files changed, 6 insertions, 1 deletions

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 286853548e2..c6fdfe7b744 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
@@ -191,8 +191,8 @@ public abstract class ContainerCluster<CONTAINER extends Container>
         addSimpleComponent("com.yahoo.container.jdisc.ContainerThreadFactory");
         addSimpleComponent("com.yahoo.container.handler.VipStatus");
         addSimpleComponent(com.yahoo.container.handler.ClustersStatus.class.getName());
-        addPlatformBundle(Paths.get(Defaults.getDefaults().underVespaHome("vespa-testrunner-components-jar-with-dependencies.jar")));
         addJaxProviders();
+        addTestrunnerComponentsIfTester(deployState);
     }
 
     public void setZone(Zone zone) {
@@ -207,6 +207,11 @@ public abstract class ContainerCluster<CONTAINER extends Container>
         addVipHandler();
     }
 
+    private void addTestrunnerComponentsIfTester(DeployState deployState) {
+        if (deployState.getProperties().applicationId().instance().isTester())
+            addPlatformBundle(Paths.get(Defaults.getDefaults().underVespaHome("vespa-testrunner-components-jar-with-dependencies.jar")));
+    }
+
     public final void addDefaultHandlersExceptStatus() {
         addDefaultRootHandler();
         addMetricStateHandler();