Increment build number for direct deployments

1 files changed, 6 insertions, 9 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ApplicationVersion.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ApplicationVersion.java
index a9a3e080109..76d7bdc4f12 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ApplicationVersion.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/ApplicationVersion.java
@@ -89,15 +89,12 @@ public class ApplicationVersion implements Comparable<ApplicationVersion> {
 
     /** Returns an unique identifier for this version or "unknown" if version is not known */
     public String id() {
-        if (isUnknown()) {
-            return "unknown";
-        }
-        return String.format("%s.%d-%s",
-                             majorVersion,
-                             buildNumber.getAsLong(),
-                             source.map(SourceRevision::commit).map(ApplicationVersion::abbreviateCommit)
-                                   .or(this::commit)
-                                   .orElse("unknown"));
+        if (isUnknown()) return "unknown";
+
+        return source.map(SourceRevision::commit).map(ApplicationVersion::abbreviateCommit)
+                .or(this::commit)
+                .map(commit -> String.format("%s.%d-%s", majorVersion, buildNumber.getAsLong(), commit))
+                .orElseGet(() -> majorVersion + "." + buildNumber.getAsLong());
     }
 
     /**