diff options
| author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-10-09 15:19:17 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-10-09 15:19:17 +0200 |
| commit | e9f9e0697b8bc4789058171b3f642ea9fd18b97a (patch) | |
| tree | cea2d6c0e3def9c9ae037435a89e36e83c876ae9 /config-model-api | |
| parent | a9516bbd206d26180d9bc6f0ab080588b4ca52a0 (diff) | |
Support blocking application changes
Diffstat (limited to 'config-model-api')
| -rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java | 4 | ||||
| -rw-r--r-- | config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java index b2a908077e5..d1e8dc21549 100644 --- a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java +++ b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java @@ -270,8 +270,8 @@ public class DeploymentSpec { // TODO: Remove block-upgrade on Vespa 7 if ( ! "block-change".equals(tag.getTagName()) && !"block-upgrade".equals(tag.getTagName())) continue; - boolean blockVersions = trueOrMissing(tag.getAttribute("versions")); - boolean blockRevisions = trueOrMissing(tag.getAttribute("revisions")) + boolean blockVersions = trueOrMissing(tag.getAttribute("version")); + boolean blockRevisions = trueOrMissing(tag.getAttribute("revision")) && !tag.getTagName().equals("block-upgrade"); // TODO: Remove condition on Vespa 7 String daySpec = tag.getAttribute("days"); 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 c2b68b54655..943432213ac 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 @@ -313,7 +313,7 @@ public class DeploymentSpecTest { public void deploymentSpecWithChangeBlocker() { StringReader r = new StringReader( "<deployment>\n" + - " <block-change revisions='false' days='mon,tue' hours='15-16'/>\n" + + " <block-change revision='false' days='mon,tue' hours='15-16'/>\n" + " <block-change days='sat' hours='10' time-zone='CET'/>\n" + " <prod>\n" + " <region active='true'>us-west-1</region>\n" + |