Create version cache once

1 files changed, 5 insertions, 2 deletions

diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java
index b7014fbd280..dcbac44a37f 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/os/OsVersionsTest.java
@@ -521,7 +521,7 @@ public class OsVersionsTest {
     public void skips_unavailable_version() {
         MockHostProvisioner hostProvisioner = new MockHostProvisioner(List.of());
         ProvisioningTester tester = new ProvisioningTester.Builder().dynamicProvisioning(true, false).hostProvisioner(hostProvisioner).build();
-        OsVersions versions = new OsVersions(tester.nodeRepository(), Cloud.builder().dynamicProvisioning(true).build(), Optional.of(hostProvisioner));
+        OsVersions versions = tester.nodeRepository().osVersions();
         tester.makeReadyHosts(1, new NodeResources(2,4,8,100));
         tester.activateTenantHosts();
         Supplier<Node> host = () -> tester.nodeRepository().nodes().list().nodeType(NodeType.host).first().get();
@@ -533,9 +533,12 @@ public class OsVersionsTest {
         versions.resumeUpgradeOf(NodeType.host, true);
         assertTrue("Upgrade is not triggered to unavailable version", host.get().status().osVersion().wanted().isEmpty());
 
-        // Version becomes available
+        // Version becomes available, but is not used until cache expires
         hostProvisioner.addOsVersion(version0);
         versions.resumeUpgradeOf(NodeType.host, true);
+        assertTrue(host.get().status().osVersion().wanted().isEmpty());
+        versions.invalidate();
+        versions.resumeUpgradeOf(NodeType.host, true);
         assertEquals("Host upgrade is triggered", version0, host.get().status().osVersion().wanted().get());
     }