summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Marius Venstad <jonmv@users.noreply.github.com>2019-02-21 11:28:11 +0100
committerGitHub <noreply@github.com>2019-02-21 11:28:11 +0100
commit5c54da257ebf28b7b9d8dc62ed5638f53fd71fd7 (patch)
tree60e68f87fd81da594438f57cc5584049c2e98358
parent4380cd5a3cdf50c6dd5d39e0a0b8b245b8ae70e5 (diff)
parent0261ba2dc708ac1c812efa24248bb344d08d1c82 (diff)
Merge pull request #8571 from vespa-engine/hmusum/no-redeploy-in-test-zones
No need to do redeployments in test environments
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java
index 2496d9ba8c9..7fdd9a168c8 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java
@@ -182,7 +182,8 @@ public class NodeRepositoryMaintenance extends AbstractComponent {
DefaultTimes(Zone zone) {
failGrace = Duration.ofMinutes(60);
periodicRedeployInterval = Duration.ofMinutes(30);
- redeployMaintainerInterval = Duration.ofMinutes(1);
+ // Don't redeploy in test environments
+ redeployMaintainerInterval = zone.environment().isTest() ? Duration.ofDays(1) : Duration.ofMinutes(1);
operatorChangeRedeployInterval = Duration.ofMinutes(1);
failedExpirerInterval = Duration.ofMinutes(10);
provisionedExpiry = Duration.ofHours(4);