Merge pull request #26804 from vespa-engine/revert-26797-jonmv/require-containers-in-cloud

Revert "Forbid applications without a container cluster in hosted Vespa"

3 files changed, 1 insertions, 64 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ContainerInCloudValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ContainerInCloudValidatorTest.java
deleted file mode 100644
index 3feb8888821..00000000000
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ContainerInCloudValidatorTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.yahoo.vespa.model.application.validation;
-
-import com.yahoo.config.application.api.ApplicationPackage;
-import com.yahoo.config.model.NullConfigModelRegistry;
-import com.yahoo.config.model.deploy.DeployState;
-import com.yahoo.config.model.deploy.TestProperties;
-import com.yahoo.config.model.test.MockApplicationPackage;
-import com.yahoo.vespa.model.VespaModel;
-import org.junit.jupiter.api.Test;
-import org.xml.sax.SAXException;
-
-import java.io.IOException;
-
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-public class ContainerInCloudValidatorTest {
-
-    @Test
-    void failsWhenNoContainerInCloud() throws IOException, SAXException {
-        String noContainer = "";
-        String container = """
-                           <container id='default' version='1.0'>
-                             <nodes count='2' />
-                           </container>
-                           """;
-        runValidatorOnApp(false, container);
-        runValidatorOnApp(false, noContainer);
-        runValidatorOnApp(true, container);
-        assertEquals("Vespa Cloud applications must have at least one container cluster",
-                     assertThrows(IllegalArgumentException.class,
-                                  () -> runValidatorOnApp(true, noContainer))
-                             .getMessage());
-    }
-
-    private static void runValidatorOnApp(boolean isHosted, String container) throws IOException, SAXException {
-        String servicesXml = """
-                        <services version='1.0'>
-                          %s
-                          <content version='1.0'>
-                            <redundancy>2</redundancy>
-                            <documents>
-                            </documents>
-                            <nodes count='2' />
-                          </content>
-                        </services>
-                """.formatted(container);
-        ApplicationPackage app = new MockApplicationPackage.Builder()
-                .withServices(servicesXml)
-                .build();
-        DeployState deployState = new DeployState.Builder()
-                .applicationPackage(app)
-                .properties(new TestProperties().setHostedVespa(isHosted).setAllowUserFilters(false))
-                .build();
-        VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState);
-        new ContainerInCloudValidator().validate(model, deployState);
-    }
-
-}
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ValidationTester.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ValidationTester.java
index 78d3838d39d..cb535380b18 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ValidationTester.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/ValidationTester.java
@@ -35,7 +35,7 @@ public class ValidationTester {
 
     /** Creates a validation tester with 1 node available (in addition to cluster controllers) */
     public ValidationTester() {
-        this(5);
+        this(4);
     }
 
     /** Creates a validation tester with number of nodes available and the given test properties */
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java
index 784174a35a0..5d0a1704a1d 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexingModeChangeValidatorTest.java
@@ -79,9 +79,6 @@ public class IndexingModeChangeValidatorTest {
 
     private static String getServices(String indexingMode) {
         return "<services version='1.0'>" +
-               "  <container id='default-container' version='1.0'>" +
-               "    <nodes count='1'/>" +
-               "  </container>" +
                "  <content id='default' version='1.0'>" +
                "    <redundancy>1</redundancy>" +
                "    <documents>" +