From 01151879a8393a6b719a29e0eb56b5c9bf88dcec Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Thu, 6 Dec 2018 11:30:20 +0100 Subject: Check platform convergence for tester as well --- .../vespa/hosted/controller/deployment/InternalStepRunner.java | 7 +++++-- .../hosted/controller/deployment/InternalDeploymentTester.java | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'controller-server') 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 7cefd9ae6b4..21b110acad1 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 @@ -245,7 +245,8 @@ public class InternalStepRunner implements StepRunner { ApplicationVersion application = setTheStage ? versions.sourceApplication().orElse(versions.targetApplication()) : versions.targetApplication(); logger.log("Checking installation of " + platform + " and " + application.id() + " ..."); - if (nodesConverged(id.application(), id.type(), platform, logger) && servicesConverged(id.application(), id.type(), logger)) { + if ( nodesConverged(id.application(), id.type(), platform, logger) + && servicesConverged(id.application(), id.type(), logger)) { logger.log("Installation succeeded!"); return Optional.of(running); } @@ -266,8 +267,10 @@ public class InternalStepRunner implements StepRunner { return Optional.of(error); } + Version platform = controller.jobController().run(id).get().versions().targetPlatform(); logger.log("Checking installation of tester container ..."); - if (servicesConverged(id.tester().id(), id.type(), logger)) { + if ( nodesConverged(id.tester().id(), id.type(), platform, logger) + && servicesConverged(id.tester().id(), id.type(), logger)) { logger.log("Tester container successfully installed!"); return Optional.of(running); } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalDeploymentTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalDeploymentTester.java index 9e8ee16e0c1..ff175cef647 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalDeploymentTester.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalDeploymentTester.java @@ -190,6 +190,9 @@ public class InternalDeploymentTester { runner.run(); assertEquals(Step.Status.succeeded, jobs.active(run.id()).get().steps().get(Step.installReal)); + assertEquals(unfinished, jobs.active(run.id()).get().steps().get(Step.installTester)); + tester.configServer().nodeRepository().doUpgrade(new DeploymentId(testerId.id(), zone), Optional.empty(), run.versions().targetPlatform()); + runner.run(); assertEquals(unfinished, jobs.active(run.id()).get().steps().get(Step.installTester)); tester.configServer().convergeServices(testerId.id(), zone); runner.run(); -- cgit v1.2.3