summaryrefslogtreecommitdiffstats
path: root/controller-server/src
diff options
context:
space:
mode:
authorandreer <andreer@verizonmedia.com>2019-09-20 13:32:50 +0200
committerandreer <andreer@verizonmedia.com>2019-09-20 13:32:50 +0200
commit124901534a695f56ade34c52ec0916914d1f89d7 (patch)
treedbcbe81910e1dcb94a749edb5dea7e470b5e78d8 /controller-server/src
parent68d13112bbb3922e2456281cf155b256c8139d40 (diff)
use internal ssl context for tester app
Diffstat (limited to 'controller-server/src')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java11
1 files changed, 8 insertions, 3 deletions
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 7053c3cacc8..797b28a25b4 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
@@ -349,7 +349,12 @@ public class InternalStepRunner implements StepRunner {
for (URI endpoint : endpoints.get(zoneId).values()) {
URI workingEndpoint = controller.jobController().withWorkingSchemeAndPort(endpoint, id);
- if ( ! controller.jobController().cloud().ready(workingEndpoint)) {
+
+ boolean ready = id.instance().isTester() ?
+ controller.jobController().cloud().testerReady(workingEndpoint)
+ : controller.jobController().cloud().ready(workingEndpoint);
+
+ if (!ready) {
logger.log("Failed to get 100 consecutive OKs from " + workingEndpoint);
return false;
}
@@ -450,7 +455,7 @@ public class InternalStepRunner implements StepRunner {
return Optional.of(error);
}
- if ( ! controller.jobController().cloud().ready(testerEndpoint.get())) {
+ if ( ! controller.jobController().cloud().testerReady(testerEndpoint.get())) {
logger.log(WARNING, "Tester container went bad!");
return Optional.of(error);
}
@@ -480,7 +485,7 @@ public class InternalStepRunner implements StepRunner {
logger.log(INFO, "Tester certificate expired before tests could complete.");
return Optional.of(aborted);
}
- };
+ }
Optional<URI> testerEndpoint = controller.jobController().testerEndpoint(id);
if ( ! testerEndpoint.isPresent()) {