diff options
| author | Martin Polden <mpolden@mpolden.no> | 2022-11-15 13:52:08 +0100 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2022-11-15 14:03:57 +0100 |
| commit | 328dd453bd91dc15b1cc733bce5ef895b8d4091e (patch) | |
| tree | c8676688ecd7c13ed7194fdd376517fa8ade67a1 /controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgradeSchedulerTest.java | |
| parent | 1b538760a2e23a2ca81bda94b6bda26eab40a191 (diff) | |
Stop setting OS upgrade budget
Diffstat (limited to 'controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgradeSchedulerTest.java')
| -rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgradeSchedulerTest.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgradeSchedulerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgradeSchedulerTest.java index 3034b926c62..899745c7a39 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgradeSchedulerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgradeSchedulerTest.java @@ -47,7 +47,7 @@ public class OsUpgradeSchedulerTest { // Target is set manually Version version0 = Version.fromString("7.0.0.20220101"); - tester.controller().upgradeOsIn(cloud, version0, Duration.ofDays(1), false); + tester.controller().upgradeOsIn(cloud, version0, false); // Target remains unchanged as it hasn't expired yet for (var interval : List.of(Duration.ZERO, Duration.ofDays(30))) { @@ -106,7 +106,7 @@ public class OsUpgradeSchedulerTest { // Set initial target Version version0 = Version.fromString("7.0.0.20220101"); - tester.controller().upgradeOsIn(cloud, version0, Duration.ofDays(1), false); + tester.controller().upgradeOsIn(cloud, version0, false); // Next version is triggered Version version1 = Version.fromString("7.0.0.20220301"); @@ -137,7 +137,7 @@ public class OsUpgradeSchedulerTest { // Set initial target CloudName cloud = tester.controller().clouds().iterator().next(); Version version0 = Version.fromString("8.0"); - tester.controller().upgradeOsIn(cloud, version0, Duration.ZERO, false); + tester.controller().upgradeOsIn(cloud, version0, false); // Stable release (tagged outside trigger period) is scheduled once trigger period opens Version version1 = Version.fromString("8.1"); @@ -151,7 +151,7 @@ public class OsUpgradeSchedulerTest { // A newer version is triggered manually Version version3 = Version.fromString("8.3"); - tester.controller().upgradeOsIn(cloud, version3, Duration.ZERO, false); + tester.controller().upgradeOsIn(cloud, version3, false); // Nothing happens in next iteration as tagged release is older than manually triggered version scheduleUpgradeAfter(Duration.ofDays(7), version3, scheduler, tester); @@ -168,7 +168,7 @@ public class OsUpgradeSchedulerTest { // Set initial target CloudName cloud = tester.controller().clouds().iterator().next(); Version version0 = Version.fromString("8.0"); - tester.controller().upgradeOsIn(cloud, version0, Duration.ZERO, false); + tester.controller().upgradeOsIn(cloud, version0, false); // Latest release is not scheduled immediately Version version1 = Version.fromString("8.1"); @@ -207,7 +207,6 @@ public class OsUpgradeSchedulerTest { CloudName cloud = tester.controller().clouds().iterator().next(); OsVersionTarget target = tester.controller().osVersionTarget(cloud).get(); assertEquals(version, target.osVersion().version()); - assertEquals(Duration.ZERO, target.upgradeBudget(), "No budget when scheduling a tagged release"); } private static ZoneApi zone(String id, CloudName cloud) { |