Merge pull request #25168 from vespa-engine/freva/enable-warmup-cd

Enable container warm up in CD systems

1 files changed, 2 insertions, 3 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
index 20ea29381f3..4e00290c86e 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
@@ -614,12 +614,11 @@ public class NodeAgentImpl implements NodeAgent {
     private Duration warmUpDuration(NodeAgentContext context) {
         ZoneApi zone = context.zone();
         Optional<NodeMembership> membership = context.node().membership();
-        return zone.getSystemName().isCd()
-               || zone.getEnvironment().isTest()
+        return zone.getEnvironment().isTest()
                || context.nodeType() != NodeType.tenant
                || membership.map(mem -> ! (mem.type().hasContainer() || mem.type().isAdmin())).orElse(false)
                 ? Duration.ofSeconds(-1)
-                : warmUpDuration;
+                : warmUpDuration.dividedBy(zone.getSystemName().isCd() ? 3 : 1);
     }
 
 }