diff options
author | jonmv <venstad@gmail.com> | 2022-10-14 10:03:06 +0200 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2022-10-14 10:03:06 +0200 |
commit | 96061d556a4b0395801a51d3da70f7c9a2272c47 (patch) | |
tree | 2833e2b68045ae0b8532ae6059c63e0de28355ec | |
parent | 6e7459c9eff635d9c8227cd8d1add320f298c0e2 (diff) |
Tags influence what is deployed
2 files changed, 16 insertions, 4 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentInstanceSpec.java b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentInstanceSpec.java index 01a20cc158d..fdde4c38fb8 100644 --- a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentInstanceSpec.java +++ b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentInstanceSpec.java @@ -273,12 +273,13 @@ public class DeploymentInstanceSpec extends DeploymentSpec.Steps { } int deployableHashCode() { - List<DeploymentSpec.DeclaredZone> zones = zones().stream().filter(zone -> zone.concerns(prod)).collect(toList()); - Object[] toHash = new Object[zones.size() + 3]; + List<DeploymentSpec.DeclaredZone> zones = zones().stream().filter(zone -> zone.concerns(prod)).toList(); + Object[] toHash = new Object[zones.size() + 4]; int i = 0; toHash[i++] = name; toHash[i++] = endpoints; toHash[i++] = globalServiceId; + toHash[i++] = tags; for (DeploymentSpec.DeclaredZone zone : zones) toHash[i++] = Objects.hash(zone, zone.athenzService()); diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java index 2e51e283eb9..3870768ceb4 100644 --- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java +++ b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java @@ -1426,7 +1426,7 @@ public class DeploymentSpecTest { </deployment>""").deployableHashCode(), DeploymentSpec.fromXml(""" <deployment> - <instance id='default'> + <instance id='default' tags=' '> <test /> <staging tester-flavor='2-8-50' /> <block-change days='mon' /> @@ -1447,7 +1447,8 @@ public class DeploymentSpecTest { <region>name</region> </prod> </instance> - <instance id='two' /> </parallel> + <instance id='two' /> + </parallel> </deployment>""").deployableHashCode(), DeploymentSpec.fromXml(""" <deployment> @@ -1483,6 +1484,16 @@ public class DeploymentSpecTest { assertNotEquals(DeploymentSpec.fromXml(referenceSpec).deployableHashCode(), DeploymentSpec.fromXml(""" <deployment> + <instance id='default' tags='tag1'> + <prod> + <region>name</region> + </prod> + </instance> + </deployment>""").deployableHashCode()); + + assertNotEquals(DeploymentSpec.fromXml(referenceSpec).deployableHashCode(), + DeploymentSpec.fromXml(""" + <deployment> <instance id='custom'> <prod> <region>name</region> |