From 6c4cec39458f998da462236f473803a741c873b5 Mon Sep 17 00:00:00 2001 From: jonmv Date: Mon, 11 Apr 2022 13:30:39 +0200 Subject: Not all test setup is quite valid ... :> --- .../com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java | 2 ++ .../hosted/controller/restapi/application/ApplicationApiHandler.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java index eb1e4e54fd7..9e2a686f780 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentStatus.java @@ -155,6 +155,8 @@ public class DeploymentStatus { * and any test jobs for any outstanding change, which will likely be needed to later deploy this change. */ public Map> jobsToRun() { + if (application.revisions().last().isEmpty()) return Map.of(); + Map changes = new LinkedHashMap<>(); for (InstanceName instance : application.deploymentSpec().instanceNames()) changes.put(instance, application.require(instance).change()); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index d965038e507..d7e6a1d9c70 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -1642,7 +1642,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { .ifPresent(stepStatus -> { JobControllerApiHandlerHelper.toSlime( response.setObject("applicationVersion"), deployment.applicationVersion()); - if (!status.jobsToRun().containsKey(stepStatus.job().get())) + if ( ! status.jobsToRun().containsKey(stepStatus.job().get())) response.setString("status", "complete"); else if (stepStatus.readyAt(instance.change()).map(controller.clock().instant()::isBefore).orElse(true)) response.setString("status", "pending"); -- cgit v1.2.3