Add version combinations to test reason

4 files changed, 33 insertions, 19 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
index 22b6728adf2..bd2a6fd0a8b 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
@@ -301,7 +301,8 @@ public class DeploymentTrigger {
                                     jobs.add(deploymentJob(application, versions, change, job, reason, completedAt.get()));
                             }
                             else if (testJobs.isEmpty()) {
-                                testJobs = testJobs(application, versions, "Testing deployment for " + job.jobName(), completedAt.orElse(clock.instant()));
+                                testJobs = testJobs(application, versions, String.format("Testing deployment for %s (%s)", job.jobName(), versions.toString()),
+                                                    completedAt.orElse(clock.instant()));
                             }
                         }
                         completedAt = Optional.empty();
@@ -535,6 +536,19 @@ public class DeploymentTrigger {
             this.sourceApplication = sourceApplication;
         }
 
+        @Override
+        public String toString() {
+            return String.format("platform %s%s, application %s%s",
+                                 sourcePlatform.filter(src -> !src.equals(targetPlatform))
+                                               .map(src -> src + " -> ")
+                                               .orElse(""),
+                                 targetPlatform,
+                                 sourceApplication.filter(src -> !src.equals(targetApplication))
+                                                  .map(ApplicationVersion::id)
+                                                  .map(src -> src + " -> ")
+                                                  .orElse(""),
+                                 targetApplication.id());
+        }
     }
 
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-without-change-multiple-deployments.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-without-change-multiple-deployments.json
index 89c6f3a8615..30070e509c7 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-without-change-multiple-deployments.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-without-change-multiple-deployments.json
@@ -48,7 +48,7 @@
             "gitCommit": "commit1"
           }
         },
-        "reason": "Testing deployment for production-us-east-3",
+        "reason": "Testing deployment for production-us-east-3 (platform 6.1, application 1.0.100-commit1 -> 1.0.101-commit1)",
         "at": "(ignore)"
       },
       "lastCompleted": {
@@ -62,7 +62,7 @@
             "gitCommit": "commit1"
           }
         },
-        "reason": "Testing deployment for production-us-east-3",
+        "reason": "Testing deployment for production-us-east-3 (platform 6.1, application 1.0.100-commit1 -> 1.0.101-commit1)",
         "at": "(ignore)"
       },
       "lastSuccess": {
@@ -76,7 +76,7 @@
             "gitCommit": "commit1"
           }
         },
-        "reason": "Testing deployment for production-us-east-3",
+        "reason": "Testing deployment for production-us-east-3 (platform 6.1, application 1.0.100-commit1 -> 1.0.101-commit1)",
         "at": "(ignore)"
       }
     },
@@ -94,7 +94,7 @@
             "gitCommit": "commit1"
           }
         },
-        "reason": "Testing deployment for production-us-east-3",
+        "reason": "Testing deployment for production-us-east-3 (platform 6.1, application 1.0.100-commit1 -> 1.0.101-commit1)",
         "at": "(ignore)"
       },
       "lastCompleted": {
@@ -108,7 +108,7 @@
             "gitCommit": "commit1"
           }
         },
-        "reason": "Testing deployment for production-us-east-3",
+        "reason": "Testing deployment for production-us-east-3 (platform 6.1, application 1.0.100-commit1 -> 1.0.101-commit1)",
         "at": "(ignore)"
       },
       "lastSuccess": {
@@ -122,7 +122,7 @@
             "gitCommit": "commit1"
           }
         },
-        "reason": "Testing deployment for production-us-east-3",
+        "reason": "Testing deployment for production-us-east-3 (platform 6.1, application 1.0.100-commit1 -> 1.0.101-commit1)",
         "at": "(ignore)"
       }
     },
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application.json
index e3d7c86c051..dabeb3239aa 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application.json
@@ -58,7 +58,7 @@
             "gitCommit": "commit1"
           }
         },
-        "reason": "Testing deployment for production-corp-us-east-1",
+        "reason": "Testing deployment for production-corp-us-east-1 (platform 6.1, application 1.0.42-commit1)",
         "at": "(ignore)"
       },
       "lastCompleted": {
@@ -72,7 +72,7 @@
             "gitCommit": "commit1"
           }
         },
-        "reason": "Testing deployment for production-corp-us-east-1",
+        "reason": "Testing deployment for production-corp-us-east-1 (platform 6.1, application 1.0.42-commit1)",
         "at": "(ignore)"
       },
       "lastSuccess": {
@@ -86,7 +86,7 @@
             "gitCommit": "commit1"
           }
         },
-        "reason": "Testing deployment for production-corp-us-east-1",
+        "reason": "Testing deployment for production-corp-us-east-1 (platform 6.1, application 1.0.42-commit1)",
         "at": "(ignore)"
       }
     },
@@ -104,7 +104,7 @@
             "gitCommit": "commit1"
           }
         },
-        "reason": "Testing deployment for production-corp-us-east-1",
+        "reason": "Testing deployment for production-corp-us-east-1 (platform 6.1, application 1.0.42-commit1)",
         "at": "(ignore)"
       },
       "lastCompleted": {
@@ -118,7 +118,7 @@
             "gitCommit": "commit1"
           }
         },
-        "reason": "Testing deployment for production-corp-us-east-1",
+        "reason": "Testing deployment for production-corp-us-east-1 (platform 6.1, application 1.0.42-commit1)",
         "at": "(ignore)"
       },
       "lastSuccess": {
@@ -132,7 +132,7 @@
             "gitCommit": "commit1"
           }
         },
-        "reason": "Testing deployment for production-corp-us-east-1",
+        "reason": "Testing deployment for production-corp-us-east-1 (platform 6.1, application 1.0.42-commit1)",
         "at": "(ignore)"
       }
     },
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application1-recursive.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application1-recursive.json
index 4bc7511c695..174bb2f1ba7 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application1-recursive.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application1-recursive.json
@@ -58,7 +58,7 @@
             "gitCommit": "commit1"
           }
         },
-        "reason": "Testing deployment for production-corp-us-east-1",
+        "reason": "Testing deployment for production-corp-us-east-1 (platform 6.1, application 1.0.42-commit1)",
         "at": "(ignore)"
       },
       "lastCompleted": {
@@ -72,7 +72,7 @@
             "gitCommit": "commit1"
           }
         },
-        "reason": "Testing deployment for production-corp-us-east-1",
+        "reason": "Testing deployment for production-corp-us-east-1 (platform 6.1, application 1.0.42-commit1)",
         "at": "(ignore)"
       },
       "lastSuccess": {
@@ -86,7 +86,7 @@
             "gitCommit": "commit1"
           }
         },
-        "reason": "Testing deployment for production-corp-us-east-1",
+        "reason": "Testing deployment for production-corp-us-east-1 (platform 6.1, application 1.0.42-commit1)",
         "at": "(ignore)"
       }
     },
@@ -104,7 +104,7 @@
             "gitCommit": "commit1"
           }
         },
-        "reason": "Testing deployment for production-corp-us-east-1",
+        "reason": "Testing deployment for production-corp-us-east-1 (platform 6.1, application 1.0.42-commit1)",
         "at": "(ignore)"
       },
       "lastCompleted": {
@@ -118,7 +118,7 @@
             "gitCommit": "commit1"
           }
         },
-        "reason": "Testing deployment for production-corp-us-east-1",
+        "reason": "Testing deployment for production-corp-us-east-1 (platform 6.1, application 1.0.42-commit1)",
         "at": "(ignore)"
       },
       "lastSuccess": {
@@ -132,7 +132,7 @@
             "gitCommit": "commit1"
           }
         },
-        "reason": "Testing deployment for production-corp-us-east-1",
+        "reason": "Testing deployment for production-corp-us-east-1 (platform 6.1, application 1.0.42-commit1)",
         "at": "(ignore)"
       }
     },