diff options
author | Martin Polden <mpolden@mpolden.no> | 2022-05-05 08:48:41 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-05 08:48:41 +0200 |
commit | d70294bad4001954d048e99039e3caece1fcdfa4 (patch) | |
tree | d9827821e90494075aeb722ad0395b08d86bdf11 /controller-server | |
parent | 8897c6d30b5d3aef02e78ff70c157142c79486ee (diff) | |
parent | 817e652b91158cfb4ce0a705b8ecb006b340a7d9 (diff) |
Merge pull request #22443 from vespa-engine/mpolden/fix-image-expiry
Include architecture in ContainerImage tag
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ContainerImageExpirerTest.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ContainerImageExpirerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ContainerImageExpirerTest.java index b52d9de2fe8..baebf7239ee 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ContainerImageExpirerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ContainerImageExpirerTest.java @@ -3,6 +3,7 @@ package com.yahoo.vespa.hosted.controller.maintenance; import com.yahoo.component.Version; import com.yahoo.vespa.hosted.controller.api.integration.container.ContainerImage; +import com.yahoo.vespa.hosted.controller.api.integration.container.ContainerImage.Architecture; import com.yahoo.vespa.hosted.controller.deployment.DeploymentTester; import com.yahoo.vespa.hosted.controller.integration.ContainerRegistryMock; import org.junit.Test; @@ -10,6 +11,7 @@ import org.junit.Test; import java.time.Duration; import java.time.Instant; import java.util.List; +import java.util.Optional; import static org.junit.Assert.assertEquals; @@ -25,9 +27,10 @@ public class ContainerImageExpirerTest { ContainerRegistryMock registry = tester.controllerTester().serviceRegistry().containerRegistry(); Instant instant = tester.clock().instant(); - ContainerImage image0 = new ContainerImage("image0", "registry.example.com", "vespa/vespa", instant, Version.fromString("7.1")); - ContainerImage image1 = new ContainerImage("image1", "registry.example.com", "vespa/vespa", instant, Version.fromString("7.2")); - ContainerImage image2 = new ContainerImage("image2", "registry.example.com", "vespa/vespa", instant, Version.fromString("7.4")); + ContainerImage image0 = new ContainerImage("image0", "registry.example.com", "vespa/vespa", instant, Version.fromString("7.1"), Optional.empty()); + ContainerImage image1 = new ContainerImage("image1", "registry.example.com", "vespa/vespa", instant, Version.fromString("7.2"), Optional.of(Architecture.amd64)); + ContainerImage image2 = new ContainerImage("image2", "registry.example.com", "vespa/vespa", instant, Version.fromString("7.4"), Optional.of(Architecture.amd64)); + registry.add(image0) .add(image1) .add(image2); @@ -50,7 +53,7 @@ public class ContainerImageExpirerTest { assertEquals(List.of(image1, image2), registry.list()); // A new version becomes active. The active and future version are kept - ContainerImage image3 = new ContainerImage("image3", "registry.example.com", "vespa/vespa", tester.clock().instant(), Version.fromString("7.3")); + ContainerImage image3 = new ContainerImage("image3", "registry.example.com", "vespa/vespa", tester.clock().instant(), Version.fromString("7.3"), Optional.of(Architecture.amd64)); registry.add(image3); tester.controllerTester().upgradeSystem(image3.version()); expirer.maintain(); |