Let block-upgrade continue to work

4 files changed, 10 insertions, 6 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" +
diff --git a/config-model/src/main/resources/schema/deployment.rnc b/config-model/src/main/resources/schema/deployment.rnc
index 9a5eb46590c..90bff8e31b3 100644
--- a/config-model/src/main/resources/schema/deployment.rnc
+++ b/config-model/src/main/resources/schema/deployment.rnc
@@ -25,7 +25,9 @@ BlockChange = element block-change {
 }
 
 BlockUpgrade = element block-upgrade { # Legacy name - remove on Vespa 7
-    BlockChange 
+    attribute days { xsd:string } &
+    attribute hours { xsd:string } &
+    attribute time-zone { xsd:string }?
 }
 
 Test = element test {
diff --git a/config-model/src/test/schema-test-files/deployment.xml b/config-model/src/test/schema-test-files/deployment.xml
index 0b47903ae39..f469d22b6f0 100644
--- a/config-model/src/test/schema-test-files/deployment.xml
+++ b/config-model/src/test/schema-test-files/deployment.xml
@@ -5,6 +5,7 @@
     <staging/>
     <block-change revision='true' version='false' days="mon,tue" hours="14,15"/>
     <block-change days="mon,tue" hours="14,15" time-zone="CET"/>
+    <block-upgrade days="wed" hours="16" time-zone="CET"/><!-- Tests legacy name. Remove in Vespa 7 -->
     <prod global-service-id='qrs'>
         <region active='true'>us-west-1</region>
         <delay hours='3'/>