Merge pull request #29560 from vespa-engine/hmusum/cleanup-adminClusterNodeResourcesArchitecture

GC adminClusterNodeResourcesArchitecture, not used in config-model

3 files changed, 1 insertions, 18 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
index 41df042284e..cd4998bb912 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
@@ -24,8 +24,6 @@ import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
-import static com.yahoo.config.provision.NodeResources.Architecture;
-
 /**
  * A test-only Properties class
  *
@@ -81,7 +79,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     private int rpc_events_before_wakeup = 1;
     private int mbus_network_threads = 1;
     private int heapSizePercentage = ApplicationContainerCluster.defaultHeapSizePercentageOfAvailableMemory;
-    private Architecture adminClusterNodeResourcesArchitecture = Architecture.getDefault();
     private Optional<CloudAccount> cloudAccount = Optional.empty();
     private boolean allowUserFilters = true;
     private List<DataplaneToken> dataplaneTokens;
@@ -362,11 +359,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
         return this;
     }
 
-    public TestProperties setAdminClusterNodeResourcesArchitecture(Architecture architecture) {
-        this.adminClusterNodeResourcesArchitecture = architecture;
-        return this;
-    }
-
     public TestProperties setCloudAccount(CloudAccount cloudAccount) {
         this.cloudAccount = Optional.ofNullable(cloudAccount);
         return this;
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
index de7e8788f62..b1d90b07b9d 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
@@ -1644,7 +1644,6 @@ public class ModelProvisioningTest {
 
         VespaModelTester tester = new VespaModelTester();
         tester.setHosted(true);
-        tester.setAdminClusterArchitecture(Architecture.arm64);
         tester.useDedicatedNodeForLogserver(true);
         tester.addHosts(new NodeResources(13.5, 100, 1000, 0.3), 4);
         tester.addHosts(new NodeResources(0.5, 2, 50, 0.3, DiskSpeed.fast, StorageType.any, Architecture.arm64), 4); // 3 ccs, 1 logserver
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java
index 446a48afd20..7037480f853 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java
@@ -32,7 +32,6 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
-import static com.yahoo.config.provision.NodeResources.Architecture;
 import static com.yahoo.vespa.model.test.utils.ApplicationPackageUtils.generateSchemas;
 
 /**
@@ -57,7 +56,6 @@ public class VespaModelTester {
     private final Map<NodeResources, Collection<Host>> hostsByResources = new HashMap<>();
     private ApplicationId applicationId = ApplicationId.defaultId();
     private boolean useDedicatedNodeForLogserver = false;
-    private Architecture adminClusterArchitecture = Architecture.getDefault();;
     private HostProvisioner provisioner;
 
     public VespaModelTester() {
@@ -108,11 +106,6 @@ public class VespaModelTester {
     /** Sets whether this sets up a model for a hosted system. Default: true */
     public void setModelProperties(TestProperties testProperties) { this.modelProperties = testProperties; }
 
-    /** Sets architecture to use for admin clusters. Default: x86_64 */
-    public void setAdminClusterArchitecture(Architecture architecture) {
-        this.adminClusterArchitecture = architecture;
-    }
-
     /** Sets the tenant, application name, and instance name of the model being built. */
     public void setApplicationId(String tenant, String applicationName, String instanceName) {
         applicationId = ApplicationId.from(tenant, applicationName, instanceName);
@@ -231,8 +224,7 @@ public class VespaModelTester {
                 .setMultitenant(hosted) // Note: system tests are multitenant but not hosted
                 .setHostedVespa(hosted)
                 .setApplicationId(applicationId)
-                .setUseDedicatedNodeForLogserver(useDedicatedNodeForLogserver)
-                .setAdminClusterNodeResourcesArchitecture(adminClusterArchitecture);
+                .setUseDedicatedNodeForLogserver(useDedicatedNodeForLogserver);
 
         DeployState.Builder deployState = deployStateBuilder
                 .applicationPackage(appPkg)