No zone dimension here

2 files changed, 3 insertions, 9 deletions

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 91df3fee6e8..35c6a0a8198 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
@@ -462,16 +462,13 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
     private static String buildJvmGCOptions(Zone zone, String jvmGCOPtions, boolean isHostedVespa) {
         if (jvmGCOPtions != null) {
             return jvmGCOPtions;
-        } else if (zone.system() == SystemName.dev) {
+        } else if ((zone.system() == SystemName.dev) || isHostedVespa) {
             return ContainerCluster.G1GC;
-        } else if (isHostedVespa) {
-            return ((zone.environment() != Environment.prod) || RegionName.from("us-east-3").equals(zone.region()))
-                    ? ContainerCluster.G1GC : ContainerCluster.CMS;
         } else {
             return ContainerCluster.CMS;
         }
     }
-    private String getJvmOptions(ContainerCluster cluster, Element nodesElement, DeployLogger deployLogger) {
+    private static String getJvmOptions(ContainerCluster cluster, Element nodesElement, DeployLogger deployLogger) {
         String jvmOptions = "";
         if (nodesElement.hasAttribute(VespaDomBuilder.JVM_OPTIONS)) {
             jvmOptions = nodesElement.getAttribute(VespaDomBuilder.JVM_OPTIONS);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
index 396fe3e0af5..aa1ac401014 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
@@ -163,11 +163,8 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase {
 
     @Test
     public void requireThatJvmGCOptionsIsHonoured()  throws IOException, SAXException {
-        final Zone US_EAST_3 = new Zone(Environment.prod, RegionName.from("us-east-3"));
         verifyJvmGCOptions(false, Zone.defaultZone(),ContainerCluster.CMS);
-        verifyJvmGCOptions(false, US_EAST_3, ContainerCluster.CMS);
-        verifyJvmGCOptions(true, Zone.defaultZone(), ContainerCluster.CMS);
-        verifyJvmGCOptions(true, US_EAST_3, ContainerCluster.G1GC);
+        verifyJvmGCOptions(true, Zone.defaultZone(), ContainerCluster.G1GC);
     }
 
     @Test