diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-01-31 18:21:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-31 18:21:24 +0100 |
commit | d79d05ec4d248a14f715cd8fef5a61b5153de9f4 (patch) | |
tree | e4b1bd4e5eba58587a1afac7f5f3181689971b93 | |
parent | 237f5a4edfdaa8d8ac7a4bdef9ea632ec5583cfe (diff) | |
parent | 1655c66ef2f83eb6814be6a320ce1a2a6b91144f (diff) |
Merge pull request #20995 from vespa-engine/olaa/write-bundle-hash
Write bundle hash
2 files changed, 2 insertions, 0 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java index 30b6920fd79..4a3368a7228 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java @@ -249,6 +249,7 @@ public class ApplicationSerializer { applicationVersion.sourceUrl().ifPresent(url -> object.setString(sourceUrlField, url)); applicationVersion.commit().ifPresent(commit -> object.setString(commitField, commit)); object.setBool(deployedDirectlyField, applicationVersion.isDeployedDirectly()); + applicationVersion.bundleHash().ifPresent(bundleHash -> object.setString(bundleHashField, bundleHash)); } private void toSlime(SourceRevision sourceRevision, Cursor object) { diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java index 06c9daa1892..e7e54828a5d 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java @@ -158,6 +158,7 @@ public class ApplicationSerializerTest { assertEquals(original.latestVersion().get().buildTime(), serialized.latestVersion().get().buildTime()); assertEquals(original.latestVersion().get().sourceUrl(), serialized.latestVersion().get().sourceUrl()); assertEquals(original.latestVersion().get().commit(), serialized.latestVersion().get().commit()); + assertEquals(original.latestVersion().get().bundleHash(), serialized.latestVersion().get().bundleHash()); // Check deployed versions are added assertEquals(original.versions(), serialized.versions()); assertEquals(serialized.versions(), new TreeSet<>(Set.of(applicationVersion1, applicationVersion2))); |