From 11b32e6636b31c27ba0935a9fb05b90f6a4012f2 Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Thu, 19 Sep 2019 09:25:34 +0200 Subject: Indicate what change we are waiting for in deployment view --- .../controller/restapi/application/JobControllerApiHandlerHelper.java | 2 +- .../vespa/hosted/controller/restapi/application/responses/jobs.json | 2 +- .../vespa/hosted/controller/restapi/application/responses/overview.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java index 4742a8d54ef..7fd5738b605 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java @@ -180,7 +180,7 @@ class JobControllerApiHandlerHelper { lastPlatformObject.setString("pending", instance.change().isEmpty() ? "Waiting for upgrade slot" - : "Waiting for current deployment to complete"); + : "Waiting for " + instance.change() + " to complete"); } private static void lastApplicationToSlime(Cursor lastApplicationObject, Instance instance, Change change, DeploymentSteps steps, Controller controller) { diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/jobs.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/jobs.json index 8c92288f88c..990618f28bc 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/jobs.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/jobs.json @@ -3,7 +3,7 @@ "platform": { "platform": "6.1", "at": "(ignore)", - "pending": "Waiting for current deployment to complete" + "pending": "Waiting for application change to 1.0.45-d00d to complete" }, "application": { "application": { diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/overview.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/overview.json index 2fbf203982f..9c9e1b5ec67 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/overview.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/overview.json @@ -3,7 +3,7 @@ "platform": { "platform": "7.1", "at": 0, - "pending": "Waiting for current deployment to complete" + "pending": "Waiting for application change to 1.0.3-commit1 to complete" }, "application": { "application": { -- cgit v1.2.3