Introduce a more detailed Readiness object for planned deployment jobs

4 files changed, 32 insertions, 34 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview-2.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview-2.json
index a02fb1fb375..37881b19905 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview-2.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview-2.json
@@ -9,6 +9,7 @@
       "declared": true,
       "instance": "default",
       "readyAt": 0,
+      "delayCause": null,
       "deploying": {
         "application": {
           "build": 3,
@@ -155,6 +156,7 @@
       "declared": false,
       "instance": "default",
       "readyAt": 0,
+      "delayCause": null,
       "jobName": "system-test",
       "url": "https://some.url:43/instance/default/job/system-test",
       "environment": "test",
@@ -344,6 +346,7 @@
       "readyAt": 15153000,
       "delayedUntil": 15153000,
       "coolingDownUntil": 15153000,
+      "delayCause": "coolingDown",
       "jobName": "staging-test",
       "url": "https://some.url:43/instance/default/job/staging-test",
       "environment": "staging",
@@ -777,6 +780,7 @@
       "declared": true,
       "instance": "default",
       "readyAt": 14403000,
+      "delayCause": null,
       "jobName": "production-us-central-1",
       "url": "https://some.url:43/instance/default/job/production-us-central-1",
       "environment": "prod",
@@ -902,6 +906,7 @@
       ],
       "declared": true,
       "instance": "default",
+      "delayCause": "notReady",
       "jobName": "test-us-central-1",
       "url": "https://some.url:43/instance/default/job/test-us-central-1",
       "environment": "prod",
@@ -1042,6 +1047,7 @@
       ],
       "declared": true,
       "instance": "default",
+      "delayCause": "notReady",
       "jobName": "production-us-west-1",
       "url": "https://some.url:43/instance/default/job/production-us-west-1",
       "environment": "prod",
@@ -1150,6 +1156,7 @@
       ],
       "declared": true,
       "instance": "default",
+      "delayCause": "notReady",
       "jobName": "production-us-east-3",
       "url": "https://some.url:43/instance/default/job/production-us-east-3",
       "environment": "prod",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json
index 35dd6fc5398..9a9bc4abf03 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json
@@ -9,6 +9,7 @@
       "declared": true,
       "instance": "instance1",
       "readyAt": 0,
+      "delayCause": null,
       "deploying": {
         "application": {
           "build": 4,
@@ -59,6 +60,7 @@
       "declared": false,
       "instance": "instance1",
       "readyAt": 0,
+      "delayCause": null,
       "jobName": "system-test",
       "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/job/system-test",
       "environment": "test",
@@ -187,6 +189,7 @@
       "declared": false,
       "instance": "instance1",
       "readyAt": 0,
+      "delayCause": null,
       "jobName": "staging-test",
       "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/job/staging-test",
       "environment": "staging",
@@ -348,6 +351,7 @@
       ],
       "declared": true,
       "instance": "instance1",
+      "delayCause": "unverified",
       "jobName": "production-us-central-1",
       "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/job/production-us-central-1",
       "environment": "prod",
@@ -405,6 +409,7 @@
       ],
       "declared": true,
       "instance": "instance1",
+      "delayCause": "notReady",
       "jobName": "production-us-west-1",
       "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/job/production-us-west-1",
       "environment": "prod",
@@ -462,6 +467,7 @@
       ],
       "declared": true,
       "instance": "instance1",
+      "delayCause": "notReady",
       "jobName": "production-us-east-3",
       "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance1/job/production-us-east-3",
       "environment": "prod",
@@ -547,6 +553,7 @@
       ],
       "declared": true,
       "instance": "instance2",
+      "delayCause": "notReady",
       "deploying": {
         "application": {
           "build": 4,
@@ -598,6 +605,7 @@
       ],
       "declared": true,
       "instance": "instance2",
+      "delayCause": "unverified",
       "jobName": "production-us-central-1",
       "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance2/job/production-us-central-1",
       "environment": "prod",
@@ -624,6 +632,7 @@
       ],
       "declared": true,
       "instance": "instance2",
+      "delayCause": "notReady",
       "jobName": "production-us-west-1",
       "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance2/job/production-us-west-1",
       "environment": "prod",
@@ -650,6 +659,7 @@
       ],
       "declared": true,
       "instance": "instance2",
+      "delayCause": "notReady",
       "jobName": "production-us-east-3",
       "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1/instance/instance2/job/production-us-east-3",
       "environment": "prod",
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java
index 7ee5f6db9b9..c942a7ad63d 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java
@@ -18,6 +18,7 @@ import com.yahoo.vespa.hosted.controller.versions.VespaVersion;
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -76,7 +77,7 @@ public class DeploymentApiTest extends ControllerContainerTest {
         deploymentTester.upgrader().maintain();
         deploymentTester.triggerJobs();
         productionApp.runJob(DeploymentContext.systemTest).runJob(DeploymentContext.stagingTest).runJob(DeploymentContext.productionUsWest1);
-        failingApp.failDeployment(DeploymentContext.systemTest).failDeployment(DeploymentContext.stagingTest);
+        failingApp.failDeployment(DeploymentContext.systemTest).failDeployment(DeploymentContext.stagingTest).timeOutConvergence(DeploymentContext.stagingTest);
         deploymentTester.upgrader().maintain();
         deploymentTester.triggerJobs();
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json
index 51398daa1d4..a1f386d51a7 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/responses/root.json
@@ -41,12 +41,11 @@
           "compileVersion": "6.1.0",
           "jobs": [
             {
-              "name": "system-test",
-              "coolingDownUntil": 1600000000000
+              "name": "system-test"
             },
             {
               "name": "staging-test",
-              "coolingDownUntil": 1600000000000
+              "coolingDownUntil": 1600022201500
             },
             {
               "name": "production-us-west-1"
@@ -141,7 +140,7 @@
           "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1",
           "upgradePolicy": "default",
           "failing": "staging-test",
-          "status": "error"
+          "status": "installationFailed"
         }
       ],
       "productionApplications": [
@@ -165,14 +164,6 @@
           "running": "system-test"
         },
         {
-          "tenant": "tenant1",
-          "application": "application1",
-          "instance": "default",
-          "url": "http://localhost:8080/application/v4/tenant/tenant1/application/application1",
-          "upgradePolicy": "default",
-          "running": "staging-test"
-        },
-        {
           "tenant": "tenant2",
           "application": "application2",
           "instance": "i2",
@@ -193,12 +184,11 @@
           "jobs": [
             {
               "name": "system-test",
-              "coolingDownUntil": 1600000000000,
               "pending": "application"
             },
             {
               "name": "staging-test",
-              "coolingDownUntil": 1600000000000,
+              "coolingDownUntil": 1600022201500,
               "pending": "platform"
             },
             {
@@ -222,15 +212,10 @@
             },
             "staging-test": {
               "failing": {
-                "number": 2,
-                "start": 1600000000000,
-                "end": 1600000000000,
-                "status": "error"
-              },
-              "running": {
                 "number": 3,
                 "start": 1600000000000,
-                "status": "running"
+                "end": 1600014401000,
+                "status": "installationFailed"
               }
             }
           },
@@ -250,15 +235,10 @@
             },
             "staging-test": {
               "failing": {
-                "number": 2,
-                "start": 1600000000000,
-                "end": 1600000000000,
-                "status": "error"
-              },
-              "running": {
                 "number": 3,
                 "start": 1600000000000,
-                "status": "running"
+                "end": 1600014401000,
+                "status": "installationFailed"
               }
             }
           }
@@ -289,15 +269,15 @@
             "system-test": {
               "failing": {
                 "number": 3,
-                "start": 1600000000000,
-                "end": 1600000000000,
+                "start": 1600014401000,
+                "end": 1600014401000,
                 "status": "error"
               }
             },
             "staging-test": {
               "running": {
                 "number": 3,
-                "start": 1600000000000,
+                "start": 1600014401000,
                 "status": "running"
               }
             },
@@ -341,7 +321,7 @@
             "production-us-west-1": {
               "running": {
                 "number": 2,
-                "start": 1600000000000,
+                "start": 1600014401000,
                 "status": "running"
               }
             }
@@ -350,7 +330,7 @@
             "production-us-west-1": {
               "running": {
                 "number": 2,
-                "start": 1600000000000,
+                "start": 1600014401000,
                 "status": "running"
               }
             }