diff options
| author | Håkon Hallingstad <hakon.hallingstad@gmail.com> | 2022-08-19 17:36:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-19 17:36:51 +0200 |
| commit | 9c5726880f750a2d99ef56cfc660774eacd35b4e (patch) | |
| tree | 01e4c5455b37cb3f03b0e73143d6645e7190d2d3 /node-admin/src/test/java/com/yahoo | |
| parent | 2194b0c451190e2c27425a21c432370d923e7190 (diff) | |
| parent | fb15ae817a6ad701f7c155ecf1f93e20a74f5050 (diff) | |
Merge pull request #23726 from vespa-engine/hakonhall/update-vespa-version-from-wantedv8.39.19
Update Vespa version from wanted
Diffstat (limited to 'node-admin/src/test/java/com/yahoo')
2 files changed, 6 insertions, 3 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/RestartTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/RestartTest.java index 62bde5ff1a8..4cbfac4842e 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/RestartTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integration/RestartTest.java @@ -25,7 +25,10 @@ public class RestartTest { DockerImage dockerImage = DockerImage.fromString("registry.example.com/repo/image:1.2.3"); try (ContainerTester tester = new ContainerTester(List.of(dockerImage))) { String hostname = "host1.test.yahoo.com"; - NodeSpec nodeSpec = NodeSpec.Builder.testSpec(hostname).wantedDockerImage(dockerImage).build(); + NodeSpec nodeSpec = NodeSpec.Builder.testSpec(hostname) + .wantedDockerImage(dockerImage) + .wantedVespaVersion(dockerImage.tagAsVersion()) + .build(); tester.addChildNodeRepositoryNode(nodeSpec); ContainerName host1 = new ContainerName("host1"); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java index e4c2f595164..a7697e5cb5f 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java @@ -187,7 +187,7 @@ public class NodeAgentImplTest { inOrder.verify(containerOperations, times(1)).resumeNode(eq(context)); inOrder.verify(healthChecker, times(1)).verifyHealth(eq(context)); inOrder.verify(nodeRepository).updateNodeAttributes( - hostName, new NodeAttributes().withDockerImage(dockerImage).withVespaVersion(dockerImage.tagAsVersion()).withRebootGeneration(0)); + hostName, new NodeAttributes().withDockerImage(dockerImage).withVespaVersion(vespaVersion).withRebootGeneration(0)); inOrder.verify(orchestrator, never()).resume(hostName); } @@ -614,7 +614,7 @@ public class NodeAgentImplTest { inOrder.verify(aclMaintainer, times(1)).converge(eq(context)); inOrder.verify(containerOperations, times(1)).resumeNode(eq(context)); inOrder.verify(nodeRepository).updateNodeAttributes( - hostName, new NodeAttributes().withDockerImage(dockerImage).withVespaVersion(dockerImage.tagAsVersion()).withRebootGeneration(0)); + hostName, new NodeAttributes().withDockerImage(dockerImage).withVespaVersion(vespaVersion).withRebootGeneration(0)); inOrder.verify(orchestrator).resume(hostName); } |