Merge pull request #23299 from vespa-engine/bjorncs/bundles

Bjorncs/bundles [run-systemtest]

3 files changed, 10 insertions, 13 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 2b6efab3389..cb4fe8f67ca 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
@@ -36,7 +36,6 @@ import com.yahoo.vespa.model.container.component.Component;
 import com.yahoo.vespa.model.container.component.Handler;
 import com.yahoo.vespa.model.container.component.SystemBindingPattern;
 import com.yahoo.vespa.model.container.configserver.ConfigserverCluster;
-import com.yahoo.vespa.model.container.docproc.DocprocChains;
 import com.yahoo.vespa.model.utils.FileSender;
 
 import java.util.ArrayList;
@@ -115,6 +114,14 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
 
         addMetricsHandlers();
         addTestrunnerComponentsIfTester(deployState);
+        addPlatformBundlesForApplicationCluster();
+    }
+
+    private void addPlatformBundlesForApplicationCluster() {
+        Set<String> bundles = Set.of(
+                "container-search-and-docproc", "container-search-gui", "docprocs",
+                "linguistics-components", "vespaclient-container-plugin");
+        bundles.forEach(b -> addPlatformBundle(PlatformBundles.absoluteBundlePath(b)));
     }
 
     @Override
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index 5a1103de9a3..2b9961232ea 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -187,7 +187,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
 
         addEmbedderComponents(deployState, cluster, spec);
         addModelEvaluation(spec, cluster, context);
-        addVespaBundles(cluster);
         addModelEvaluationBundles(cluster);
 
         addProcessing(deployState, spec, cluster);
@@ -584,17 +583,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         return (child != null) ? Integer.parseInt(child.getTextContent()) : defaultValue;
     }
 
-    private void addVespaBundles(ApplicationContainerCluster cluster) {
-        // Skip model-evaluation bundles for node-admin
-        if (cluster.id().value().equals("node-admin")) return;
-
-        Set<String> bundles = Set.of(
-                "container-search-and-docproc", "container-search-gui", "docprocs",
-                "linguistics-components", "vespaclient-container-plugin");
-        bundles.forEach(b -> cluster.addPlatformBundle(PlatformBundles.absoluteBundlePath(b)));
-        addModelEvaluationBundles(cluster);
-    }
-
     protected void addModelEvaluationBundles(ApplicationContainerCluster cluster) {
         /* These bundles are added to all application container clusters, even if they haven't
          * declared 'model-evaluation' in services.xml, because there are many public API packages
diff --git a/standalone-container/pom.xml b/standalone-container/pom.xml
index b73212b96f6..557fb1493f1 100644
--- a/standalone-container/pom.xml
+++ b/standalone-container/pom.xml
@@ -99,10 +99,12 @@
             config-model-api-jar-with-dependencies.jar,
             config-model-jar-with-dependencies.jar,
             container-disc-jar-with-dependencies.jar,
+            <!-- START config-model dependencies -->
             container-search-and-docproc-jar-with-dependencies.jar,
             linguistics-components-jar-with-dependencies.jar,
             model-evaluation-jar-with-dependencies.jar,
             model-integration-jar-with-dependencies.jar,
+            <!-- END config-model dependencies -->
           </discPreInstallBundle>
         </configuration>
       </plugin>