Reduce grace period for non-production

1 files changed, 3 insertions, 1 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/RetiringOsUpgrader.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/RetiringOsUpgrader.java
index afee9a55870..43843f6fe5a 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/RetiringOsUpgrader.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/RetiringOsUpgrader.java
@@ -78,7 +78,9 @@ public class RetiringOsUpgrader implements OsUpgrader {
 
     /** The duration this leaves new nodes alone before scheduling any upgrade */
     private Duration gracePeriod() {
-        return nodeRepository.zone().system().isCd() ? Duration.ofDays(1) : Duration.ofDays(30);
+        if (nodeRepository.zone().system().isCd()) return Duration.ofDays(1);
+        if (!nodeRepository.zone().environment().isProduction()) return Duration.ofDays(7);
+        return Duration.ofDays(30);
     }
 
 }