diff options
| author | Martin Polden <mpolden@mpolden.no> | 2017-10-16 15:21:13 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2017-10-16 15:21:13 +0200 |
| commit | 5b08886871690ba8bcff448107db9a6a51ce3132 (patch) | |
| tree | 51c93fd00113ac51582deeb97ff6e7a7dd4a0e03 /config-model-api | |
| parent | e3d1a5add50869add4379eb9021a7c3533774534 (diff) | |
Let block-upgrade continue to work
Diffstat (limited to 'config-model-api')
2 files changed, 6 insertions, 5 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java b/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java index 35021d1b44a..624b4c1581b 100644 --- a/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java +++ b/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java @@ -1,11 +1,10 @@ package com.yahoo.config.application.api.xml; import com.yahoo.config.application.api.DeploymentSpec; -import com.yahoo.config.application.api.DeploymentSpec.Step; -import com.yahoo.config.application.api.DeploymentSpec.Delay; import com.yahoo.config.application.api.DeploymentSpec.DeclaredZone; +import com.yahoo.config.application.api.DeploymentSpec.Delay; import com.yahoo.config.application.api.DeploymentSpec.ParallelZones; -import com.yahoo.config.application.api.DeploymentSpec.ChangeBlocker; +import com.yahoo.config.application.api.DeploymentSpec.Step; import com.yahoo.config.application.api.TimeWindow; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.RegionName; @@ -157,7 +156,8 @@ public class DeploymentSpecXmlReader { // TODO: Remove block-upgrade on Vespa 7 if ( ! blockChangeTag.equals(tag.getTagName()) && !"block-upgrade".equals(tag.getTagName())) continue; - boolean blockVersions = trueOrMissing(tag.getAttribute("version")); + boolean blockVersions = tag.getTagName().equals("block-upgrade") || // TODO: Remove condition on Vespa 7 + trueOrMissing(tag.getAttribute("version")); boolean blockRevisions = trueOrMissing(tag.getAttribute("revision")) && !tag.getTagName().equals("block-upgrade"); // TODO: Remove condition on Vespa 7 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 fbf685b9d86..8bab2f83448 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 @@ -283,7 +283,8 @@ public class DeploymentSpecTest { StringReader r = new StringReader( "<deployment>\n" + " <block-upgrade days='mon,tue' hours='15-16'/>\n" + - " <block-upgrade days='sat' hours='10' time-zone='CET'/>\n" + + // version=false is ignored for block-upgrade + " <block-upgrade version='false' days='sat' hours='10' time-zone='CET'/>\n" + " <prod>\n" + " <region active='true'>us-west-1</region>\n" + " </prod>\n" + |