summaryrefslogtreecommitdiffstats
path: root/node-repository
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2018-07-06 11:22:03 +0200
committerHarald Musum <musum@oath.com>2018-07-06 11:22:03 +0200
commit908b76d684bff7b4bc77269ee2f2f53a0c8c2a46 (patch)
tree199d99a3a96a454bb8aedc240a3429bd622ff4bd /node-repository
parenta9e1f8619ae5a4db3e0909ade11feaf4a263d8ce (diff)
Do not upgrade applications to current version when bootstrapping in manually deployed zones
Diffstat (limited to 'node-repository')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockDeployer.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockDeployer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockDeployer.java
index 470aa4f39f2..99beab50e16 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockDeployer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockDeployer.java
@@ -55,8 +55,8 @@ public class MockDeployer implements Deployer {
}
@Override
- public Optional<Deployment> deployFromLocalActive(ApplicationId application) {
- return deployFromLocalActive(application, Duration.ofSeconds(60));
+ public Optional<Deployment> deployFromLocalActive(ApplicationId id, boolean bootstrap) {
+ return deployFromLocalActive(id, Duration.ofSeconds(60));
}
@Override
@@ -66,6 +66,11 @@ public class MockDeployer implements Deployer {
}
@Override
+ public Optional<Deployment> deployFromLocalActive(ApplicationId application, Duration timeout, boolean bootstrap) {
+ return deployFromLocalActive(application, timeout);
+ }
+
+ @Override
public Optional<Instant> lastDeployTime(ApplicationId application) {
return Optional.ofNullable(lastDeployTimes.get(application));
}