Make "current major version" sticky

3 files changed, 5 insertions, 5 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/VersionStatusUpdaterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/VersionStatusUpdaterTest.java
index e6f46e0630d..962288f9073 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/VersionStatusUpdaterTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/VersionStatusUpdaterTest.java
@@ -25,11 +25,10 @@ public class VersionStatusUpdaterTest {
     @Test
     void testVersionUpdating() {
         ControllerTester tester = new ControllerTester();
-        tester.controller().updateVersionStatus(new VersionStatus(Collections.emptyList()));
+        tester.controller().updateVersionStatus(VersionStatus.empty());
         assertFalse(tester.controller().readVersionStatus().systemVersion().isPresent());
 
-        VersionStatusUpdater updater = new VersionStatusUpdater(tester.controller(), Duration.ofDays(1)
-        );
+        VersionStatusUpdater updater = new VersionStatusUpdater(tester.controller(), Duration.ofDays(1));
         updater.maintain();
         assertTrue(tester.controller().readVersionStatus().systemVersion().isPresent());
     }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializerTest.java
index 618c33835bd..7c3ba5aeadf 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/VersionStatusSerializerTest.java
@@ -32,7 +32,7 @@ public class VersionStatusSerializerTest {
         vespaVersions.add(new VespaVersion(version, "cafe", Instant.now(), true, true,
                 false, nodeVersions(Version.fromString("5.0"), Version.fromString("5.1"),
                 "cfg1", "cfg2", "cfg3"), VespaVersion.Confidence.normal));
-        VersionStatus status = new VersionStatus(vespaVersions);
+        VersionStatus status = new VersionStatus(vespaVersions, 5);
         VersionStatusSerializer serializer = new VersionStatusSerializer(new NodeVersionSerializer());
         VersionStatus deserialized = serializer.fromSlime(serializer.toSlime(status));
 
@@ -49,6 +49,7 @@ public class VersionStatusSerializerTest {
             assertEquals(a.nodeVersions(), b.nodeVersions());
             assertEquals(a.confidence(), b.confidence());
         }
+        assertEquals(status.currentMajor(), deserialized.currentMajor());
 
     }
 
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 c942a7ad63d..bcc1f27c89f 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
@@ -105,7 +105,7 @@ public class DeploymentApiTest extends ControllerContainerTest {
             }
             censored.add(version);
         }
-        return new VersionStatus(censored);
+        return new VersionStatus(censored, versionStatus.currentMajor());
     }
 
 }