Remove dev system

7 files changed, 0 insertions, 44 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureVersions.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureVersions.java
index 4f913bb55dd..a1f36a4f1a5 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureVersions.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InfrastructureVersions.java
@@ -88,7 +88,6 @@ public class InfrastructureVersions {
             case controllerhost:
             case proxyhost:
             case host:
-            case devhost:
                 break;
             default:
                 throw new IllegalArgumentException("Target version for type " + nodeType + " is not allowed");
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
index 543972a9cb3..cd1b786afd1 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
@@ -554,7 +554,6 @@ public class NodeSerializer {
             case "confighost": return NodeType.confighost;
             case "controller": return NodeType.controller;
             case "controllerhost": return NodeType.controllerhost;
-            case "devhost": return NodeType.devhost;
             default : throw new IllegalArgumentException("Unknown node type '" + typeString + "'");
         }
     }
@@ -569,7 +568,6 @@ public class NodeSerializer {
             case confighost: return "confighost";
             case controller: return "controller";
             case controllerhost: return "controllerhost";
-            case devhost: return "devhost";
         }
         throw new IllegalArgumentException("Serialized form of '" + type + "' not defined");
     }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java
index 4088d717a67..290a3f8f947 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java
@@ -7,7 +7,6 @@ import com.yahoo.config.provision.ClusterResources;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.NodeResources;
-import com.yahoo.config.provision.SystemName;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.flags.PermanentFlags;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
@@ -72,10 +71,6 @@ public class CapacityPolicies {
 
     public NodeResources defaultNodeResources(ClusterSpec.Type clusterType) {
         if (clusterType == ClusterSpec.Type.admin) {
-            if (zone.system() == SystemName.dev) {
-                // Use small logserver in dev system
-                return new NodeResources(0.1, 1, 10, 0.3);
-            }
             return zone.getCloud().dynamicProvisioning() && ! sharedHosts.apply(clusterType) ?
                    new NodeResources(0.5, 4, 50, 0.3) :
                    new NodeResources(0.5, 2, 50, 0.3);
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java
index d5dbe08dca9..310f921367e 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java
@@ -71,7 +71,6 @@ public class NodeResourceLimits {
     }
 
     private double minAdvertisedMemoryGb(ClusterSpec.Type clusterType) {
-        if (zone().system() == SystemName.dev) return 1; // Allow small containers in dev system
         if (clusterType == ClusterSpec.Type.admin) return 1;
         return 4;
     }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodeSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodeSerializer.java
index be011c886a5..6282c072001 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodeSerializer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/NodeSerializer.java
@@ -53,7 +53,6 @@ public class NodeSerializer {
             case "confighost": return NodeType.confighost;
             case "controller": return NodeType.controller;
             case "controllerhost": return NodeType.controllerhost;
-            case "devhost": return NodeType.devhost;
             default: throw new IllegalArgumentException("Unknown node type '" + nodeType + "'");
         }
     }
@@ -68,7 +67,6 @@ public class NodeSerializer {
             case confighost: return "confighost";
             case controller: return "controller";
             case controllerhost: return "controllerhost";
-            case devhost: return "devhost";
             default: throw new IllegalArgumentException("Unknown node type '" + type.name() + "'");
         }
     }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/HostCapacityTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/HostCapacityTest.java
index 390df571b04..31643b2ac79 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/HostCapacityTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/HostCapacityTest.java
@@ -128,26 +128,6 @@ public class HostCapacityTest {
     }
 
     @Test
-    public void devhostCapacityTest() {
-        // Dev host can assign both configserver and tenant containers.
-
-        var nodeFlavors = FlavorConfigBuilder.createDummies("devhost", "container");
-        var devHost = Node.create("devhost", new IP.Config(Set.of("::1"), createIps(2, 10)), "devhost", nodeFlavors.getFlavorOrThrow("devhost"), NodeType.devhost).build();
-
-        var cfg = Node.reserve(Set.of("::2"), "cfg", "devhost", resources0, NodeType.config).build();
-
-        var nodes = new ArrayList<>(List.of(cfg));
-        var capacity = new HostCapacity(new LockedNodeList(nodes, () -> {}), hostResourcesCalculator);
-        assertTrue(capacity.hasCapacity(devHost, resources0));
-
-        var container1 = Node.reserve(Set.of("::3"), "container1", "devhost", resources0, NodeType.tenant).build();
-        nodes = new ArrayList<>(List.of(cfg, container1));
-        capacity = new HostCapacity(new LockedNodeList(nodes, () -> {}), hostResourcesCalculator);
-        assertFalse(capacity.hasCapacity(devHost, resources0));
-
-    }
-
-    @Test
     public void verifyCapacityFromAddresses() {
         Node nodeA = Node.reserve(Set.of("::2"), "nodeA", "host1", resources0, NodeType.tenant).build();
         Node nodeB = Node.reserve(Set.of("::3"), "nodeB", "host1", resources0, NodeType.tenant).build();
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 95f25612dd7..c9b384b95a6 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
@@ -871,19 +871,6 @@ public class ProvisioningTest {
     }
 
     @Test
-    public void devsystem_application_deployment_on_devhost() {
-        ProvisioningTester tester = new ProvisioningTester.Builder().zone(new Zone(SystemName.dev, Environment.dev, RegionName.from("no-central"))).build();
-
-        tester.makeReadyNodes(4, defaultResources, NodeType.devhost, 1);
-        tester.prepareAndActivateInfraApplication(ProvisioningTester.applicationId(), NodeType.devhost);
-
-        ApplicationId application = ProvisioningTester.applicationId();
-        SystemState state = prepare(application, 2, 2, 3, 3, defaultResources, tester);
-        assertEquals(4, state.allHosts.size());
-        tester.activate(application, state.allHosts);
-    }
-
-    @Test
     public void allocates_reserved_nodes_for_type_spec_deployment() {
         ProvisioningTester tester = new ProvisioningTester.Builder().build();
         Function<InfraApplication, Collection<HostSpec>> prepareAndActivate = app -> tester.activate(app.getApplicationId(),