From 28acbff8e0e863dd3ec231f617a83cedeb18ca0a Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@verizonmedia.com>
Date: Wed, 13 Nov 2019 16:46:17 +0100
Subject: Don't set tester storage-type for now

---
 .../vespa/hosted/controller/deployment/InternalStepRunner.java      | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'controller-server')

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
index bd87e821a74..b9c6fd8c555 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
@@ -698,10 +698,16 @@ public class InternalStepRunner implements StepRunner {
         // Of the remaining memory, split 50/50 between Surefire running the tests and the rest
         int testMemoryMb = (int) (1024 * (resources.memoryGb() - jdiscMemoryGb) / 2);
 
+        String resourceString = String.format(Locale.ENGLISH,
+                                              "<resources vcpu=\"%.2f\" memory=\"%.2fGb\" disk=\"%.2fGb\" disk-speed=\"%s\"/>",
+                                              resources.vcpu(), resources.memoryGb(), resources.diskGb(), resources.diskSpeed().name());
+        /* TODO after 18 November 2019, include storageType:
         String resourceString = String.format(Locale.ENGLISH,
                                               "<resources vcpu=\"%.2f\" memory=\"%.2fGb\" disk=\"%.2fGb\" disk-speed=\"%s\" storage-type=\"%s\"/>",
                                               resources.vcpu(), resources.memoryGb(), resources.diskGb(), resources.diskSpeed().name(), resources.storageType().name());
 
+         */
+
         AthenzDomain idDomain = ("vespa.vespa.cd".equals(domain.value()) ? AthenzDomain.from("vespa.vespa") : domain);
         String servicesXml =
                 "<?xml version='1.0' encoding='UTF-8'?>\n" +
-- 
cgit v1.2.3