Fix broken tests

4 files changed, 13 insertions, 6 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java
index 784ea284de5..8810e09dd40 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java
@@ -398,6 +398,7 @@ public class InternalStepRunnerTest {
         assertEquals(unfinished, tester.jobs().run(id).stepStatuses().get(Step.installReal));
 
         Version version = new Version("7.8.9");
+        tester.controllerTester().upgradeSystem(version);
         Future<?> concurrentDeployment = Executors.newSingleThreadExecutor().submit(() -> {
             tester.jobs().deploy(app.instanceId(), DeploymentContext.devUsEast1, Optional.of(version), applicationPackage());
         });
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdaterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdaterTest.java
index cb5a84654d0..8c44b39691c 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdaterTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ArchiveUriUpdaterTest.java
@@ -80,7 +80,7 @@ public class ArchiveUriUpdaterTest {
     }
 
     private void deploy(DeploymentContext application, ZoneId zone) {
-        application.runJob(JobType.deploymentTo(zone), new ApplicationPackage(new byte[0]), Version.fromString("7.1"));
+        application.runJob(JobType.deploymentTo(zone), new ApplicationPackage(new byte[0]));
     }
 
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainerTest.java
index 6ac0509c0f8..3bd4be3bb23 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentMetricsMaintainerTest.java
@@ -36,8 +36,10 @@ public class DeploymentMetricsMaintainerTest {
 
     @Test
     void updates_metrics() {
+        Version version1 = Version.fromString("7.1");
+        tester.controllerTester().upgradeSystem(version1);
         var application = tester.newDeploymentContext();
-        application.runJob(DeploymentContext.devUsEast1, new ApplicationPackage(new byte[0]), Version.fromString("7.1"));
+        application.runJob(DeploymentContext.devUsEast1, new ApplicationPackage(new byte[0]), version1);
 
         DeploymentMetricsMaintainer maintainer = maintainer(tester.controller());
         Supplier<Application> app = application::application;
@@ -51,7 +53,9 @@ public class DeploymentMetricsMaintainerTest {
         assertFalse(deployment.get().activity().lastWritten().isPresent(), "Never received any writes");
 
         // Metrics are gathered and saved to application
-        application.runJob(DeploymentContext.devUsEast1, new ApplicationPackage(new byte[0]), Version.fromString("7.5.5"));
+        Version version2 = Version.fromString("7.5.5");
+        tester.controllerTester().upgradeSystem(version2);
+        application.runJob(DeploymentContext.devUsEast1, new ApplicationPackage(new byte[0]), version2);
         var metrics0 = Map.of(ClusterMetrics.QUERIES_PER_SECOND, 1D,
                 ClusterMetrics.FEED_PER_SECOND, 2D,
                 ClusterMetrics.DOCUMENT_COUNT, 3D,
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/TrafficShareUpdaterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/TrafficShareUpdaterTest.java
index 07ea04b4c84..75e2bbb06e7 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/TrafficShareUpdaterTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/TrafficShareUpdaterTest.java
@@ -27,13 +27,15 @@ public class TrafficShareUpdaterTest {
     @Test
     void testTrafficUpdater() {
         DeploymentTester tester = new DeploymentTester();
+        Version version = Version.fromString("7.1");
+        tester.controllerTester().upgradeSystem(version);
         var application = tester.newDeploymentContext();
         var deploymentMetricsMaintainer = new DeploymentMetricsMaintainer(tester.controller(), Duration.ofDays(1));
         var updater = new TrafficShareUpdater(tester.controller(), Duration.ofDays(1));
         ZoneId prod1 = ZoneId.from("prod", "ap-northeast-1");
         ZoneId prod2 = ZoneId.from("prod", "us-east-3");
         ZoneId prod3 = ZoneId.from("prod", "us-west-1");
-        application.runJob(DeploymentContext.productionApNortheast1, new ApplicationPackage(new byte[0]), Version.fromString("7.1"));
+        application.runJob(DeploymentContext.productionApNortheast1, new ApplicationPackage(new byte[0]), version);
 
         // Single zone
         setQpsMetric(50.0, application.application().id().defaultInstance(), prod1, tester);
@@ -42,7 +44,7 @@ public class TrafficShareUpdaterTest {
         assertTrafficFraction(1.0, 1.0, application.instanceId(), prod1, tester);
 
         // Two zones
-        application.runJob(DeploymentContext.productionUsEast3, new ApplicationPackage(new byte[0]), Version.fromString("7.1"));
+        application.runJob(DeploymentContext.productionUsEast3, new ApplicationPackage(new byte[0]), version);
         // - one cold
         setQpsMetric(50.0, application.application().id().defaultInstance(), prod1, tester);
         setQpsMetric(0.0, application.application().id().defaultInstance(), prod2, tester);
@@ -59,7 +61,7 @@ public class TrafficShareUpdaterTest {
         assertTrafficFraction(0.47, 1.0, application.instanceId(), prod2, tester);
 
         // Three zones
-        application.runJob(DeploymentContext.productionUsWest1, new ApplicationPackage(new byte[0]), Version.fromString("7.1"));
+        application.runJob(DeploymentContext.productionUsWest1, new ApplicationPackage(new byte[0]), version);
         // - one cold
         setQpsMetric(53.0, application.application().id().defaultInstance(), prod1, tester);
         setQpsMetric(47.0, application.application().id().defaultInstance(), prod2, tester);