Remove custom non-CD cooldown

1 files changed, 5 insertions, 5 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 27cdd847fb9..1b1c4e3bf1a 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
@@ -59,20 +59,20 @@ public class OsUpgradeSchedulerTest {
         // New release becomes available, but is not triggered until cool-down period has passed, and we're inside a
         // trigger period
         Version version1 = Version.fromString("7.0.0.20220301");
-        tester.clock().advance(Duration.ofDays(16));
-        assertEquals("2022-03-03T09:05:00", formatInstant(tester.clock().instant()));
+        tester.clock().advance(Duration.ofDays(14));
+        assertEquals("2022-03-01T09:05:00", formatInstant(tester.clock().instant()));
         assertEquals(version1, scheduler.changeIn(cloud, tester.clock().instant()).get().version());
         scheduler.maintain();
         assertEquals(version0,
                      tester.controller().os().target(cloud).get().osVersion().version(),
                      "Target is unchanged because cooldown hasn't passed");
         tester.clock().advance(Duration.ofDays(3).plusHours(18));
-        assertEquals("2022-03-07T03:05:00", formatInstant(tester.clock().instant()));
+        assertEquals("2022-03-05T03:05:00", formatInstant(tester.clock().instant()));
         scheduler.maintain();
         assertEquals(version0,
                      tester.controller().os().target(cloud).get().osVersion().version(),
                      "Target is unchanged because we're outside trigger period");
-        tester.clock().advance(Duration.ofHours(5));
+        tester.clock().advance(Duration.ofDays(2).plusHours(5));
         assertEquals("2022-03-07T08:05:00", formatInstant(tester.clock().instant()));
 
         // Time constraints have now passed, but the current target has been pinned in the meantime
@@ -100,7 +100,7 @@ public class OsUpgradeSchedulerTest {
         Optional<OsUpgradeScheduler.Change> nextChange = scheduler.changeIn(cloud, tester.clock().instant());
         assertTrue(nextChange.isPresent());
         assertEquals("7.0.0.20220426", nextChange.get().version().toFullString());
-        assertEquals("2022-05-02T07:00:00", formatInstant(nextChange.get().scheduleAt()));
+        assertEquals("2022-04-27T07:00:00", formatInstant(nextChange.get().scheduleAt()));
     }
 
     @Test