Revert "Merge pull request #11770 from vespa-engine/mpolden/restore-content-combined-substition"

This reverts commit 7250e7a5cfafaa8e52a56c7990437be740761093, reversing
changes made to d220c3dd187e908afa015d5990e6dbbeb2e9876b.

1 files changed, 0 insertions, 29 deletions

diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
index b4e8b2266fb..a54afd1c229 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
@@ -625,35 +625,6 @@ public class ProvisioningTest {
         tester.activate(application, state.allHosts);
     }
 
-    @Test
-    public void change_to_combined_cluster_does_not_change_node_allocation() {
-        var tester = new ProvisioningTester.Builder().zone(new Zone(Environment.prod, RegionName.from("us-east"))).build();
-        var application = tester.makeApplicationId();
-
-        tester.makeReadyNodes(4, defaultResources);
-
-        // Application allocates two content nodes initially. This is the old behaviour where combined clusters has type
-        // content
-        ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content,
-                                                  ClusterSpec.Id.from("combined"),
-                                                  Version.fromString("1.2.3"),
-                                                  false);
-        var initialNodes = tester.activate(application, tester.prepare(application, cluster,
-                                                                       Capacity.fromCount(2, defaultResources, false, false),
-                                                                       1));
-
-        // Application is redeployed with cluster type combined
-        cluster = ClusterSpec.request(ClusterSpec.Type.combined,
-                                      ClusterSpec.Id.from("combined"),
-                                      Version.fromString("1.2.3"),
-                                      false);
-        var newNodes = tester.activate(application, tester.prepare(application, cluster,
-                                                                   Capacity.fromCount(2, defaultResources, false, false),
-                                                                   1));
-
-        assertEquals("Node allocation remains the same", initialNodes, newNodes);
-    }
-
     private SystemState prepare(ApplicationId application, int container0Size, int container1Size, int content0Size,
                                 int content1Size, NodeResources flavor, ProvisioningTester tester) {
         return prepare(application, container0Size, container1Size, content0Size, content1Size, flavor,