Start OS upgrades during work hours

1 files changed, 8 insertions, 3 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 7d512ba090c..7a0175845ca 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
@@ -24,8 +24,8 @@ public class OsUpgradeSchedulerTest {
     public void maintain() {
         ControllerTester tester = new ControllerTester();
         OsUpgradeScheduler scheduler = new OsUpgradeScheduler(tester.controller(), Duration.ofDays(1));
-        Instant initialTime = Instant.parse("2021-01-23T00:00:00.00Z");
-        tester.clock().setInstant(initialTime);
+        Instant t0 = Instant.parse("2021-01-23T00:00:00.00Z"); // Outside trigger period
+        tester.clock().setInstant(t0);
 
         CloudName cloud = CloudName.from("cloud");
         ZoneApi zone = zone("prod.us-west-1", cloud);
@@ -50,7 +50,12 @@ public class OsUpgradeSchedulerTest {
         Version version1 = Version.fromString("7.0.0.20210302");
         tester.clock().advance(Duration.ofDays(15).plus(Duration.ofSeconds(1)));
         scheduler.maintain();
-        assertEquals("New target set", version1, tester.controller().osVersionTarget(cloud).get().osVersion().version());
+        assertEquals("Target is unchanged because we're outside trigger period", version0,
+                     tester.controller().osVersionTarget(cloud).get().osVersion().version());
+        tester.clock().advance(Duration.ofHours(7)); // Put us inside the trigger period
+        scheduler.maintain();
+        assertEquals("New target set", version1,
+                     tester.controller().osVersionTarget(cloud).get().osVersion().version());
 
         // A few days pass and target remains unchanged
         tester.clock().advance(Duration.ofDays(2));