Merge pull request #3942 from vespa-engine/jvenstad/display-system-version-in-ticket

Send system version with broken deployments

4 files changed, 7 insertions, 5 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/DeploymentIssues.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/DeploymentIssues.java
index 7874fcd8c45..fdebcca6d83 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/DeploymentIssues.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/DeploymentIssues.java
@@ -1,6 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.api.integration.organization;
 
+import com.yahoo.component.Version;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.vespa.hosted.controller.api.identifiers.PropertyId;
 
@@ -19,7 +20,7 @@ public interface DeploymentIssues {
 
     IssueId fileUnlessOpen(Optional<IssueId> issueId, ApplicationId applicationId, User assignee);
 
-    IssueId fileUnlessOpen(Collection<ApplicationId> applicationIds);
+    IssueId fileUnlessOpen(Collection<ApplicationId> applicationIds, Version version);
 
     void escalateIfInactive(IssueId issueId, Optional<PropertyId> propertyId, Duration maxInactivity);
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/LoggingDeploymentIssues.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/LoggingDeploymentIssues.java
index 62dde3efe55..783a1267e64 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/LoggingDeploymentIssues.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/LoggingDeploymentIssues.java
@@ -3,6 +3,7 @@
 package com.yahoo.vespa.hosted.controller.api.integration.stubs;
 
 import com.google.inject.Inject;
+import com.yahoo.component.Version;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.vespa.hosted.controller.api.identifiers.PropertyId;
 import com.yahoo.vespa.hosted.controller.api.integration.organization.DeploymentIssues;
@@ -62,9 +63,9 @@ public class LoggingDeploymentIssues implements DeploymentIssues {
     }
 
     @Override
-    public IssueId fileUnlessOpen(Collection<ApplicationId> applicationIds) {
+    public IssueId fileUnlessOpen(Collection<ApplicationId> applicationIds, Version version) {
         if ( ! platformIssue.get())
-            log.info("These applications are all failing deployment:\n" + applicationIds);
+            log.info("These applications are all failing deployment to version " + version + ":\n" + applicationIds);
 
         platformIssue.set(true);
         return null;
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentIssueReporter.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentIssueReporter.java
index 48033645573..23068b9567f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentIssueReporter.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentIssueReporter.java
@@ -71,7 +71,8 @@ public class DeploymentIssueReporter extends Maintainer {
                                                     .upgradingTo(controller().systemVersion())
                                                     .asList().stream()
                                                     .map(Application::id)
-                                                    .collect(Collectors.toList()));
+                                                    .collect(Collectors.toList()),
+                                            controller().systemVersion());
     }
 
     private boolean oldApplicationChangeFailuresIn(DeploymentJobs jobs) {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentIssueReporterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentIssueReporterTest.java
index b4a2aa3fc19..afafe4be82b 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentIssueReporterTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentIssueReporterTest.java
@@ -8,7 +8,6 @@ import com.yahoo.vespa.hosted.controller.Application;
 import com.yahoo.vespa.hosted.controller.api.integration.organization.IssueId;
 import com.yahoo.vespa.hosted.controller.api.integration.stubs.LoggingDeploymentIssues;
 import com.yahoo.vespa.hosted.controller.application.ApplicationPackage;
-import com.yahoo.vespa.hosted.controller.application.Change;
 import com.yahoo.vespa.hosted.controller.deployment.ApplicationPackageBuilder;
 import com.yahoo.vespa.hosted.controller.deployment.DeploymentTester;
 import com.yahoo.vespa.hosted.controller.persistence.MockCuratorDb;