Remove support for block-upgrade element in deployment.xml

4 files changed, 3 insertions, 46 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 084779d2147..e70e8449922 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
@@ -219,13 +219,10 @@ public class DeploymentSpecXmlReader {
     private List<DeploymentSpec.ChangeBlocker> readChangeBlockers(Element root) {
         List<DeploymentSpec.ChangeBlocker> changeBlockers = new ArrayList<>();
         for (Element tag : XML.getChildren(root)) {
-            // TODO: Remove block-upgrade on Vespa 7
-            if ( ! blockChangeTag.equals(tag.getTagName()) && !"block-upgrade".equals(tag.getTagName())) continue;
+            if ( ! blockChangeTag.equals(tag.getTagName())) continue;
 
-            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
+            boolean blockVersions = trueOrMissing(tag.getAttribute("version"));
+            boolean blockRevisions = trueOrMissing(tag.getAttribute("revision"));
 
             String daySpec = tag.getAttribute("days");
             String hourSpec = tag.getAttribute("hours");
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 b40feb3081a..4156439834b 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
@@ -296,38 +296,6 @@ public class DeploymentSpecTest {
         }
     }
 
-    @Test
-    public void deploymentSpecWithBlockUpgrade() {
-        StringReader r = new StringReader(
-                "<deployment>\n" +
-                "  <block-upgrade days='mon,tue' hours='15-16'/>\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" +
-                "</deployment>"
-        );
-        DeploymentSpec spec = DeploymentSpec.fromXml(r);
-        assertEquals(2, spec.changeBlocker().size());
-        assertTrue(spec.changeBlocker().get(0).blocksVersions());
-        assertFalse(spec.changeBlocker().get(0).blocksRevisions());
-        assertEquals(ZoneId.of("UTC"), spec.changeBlocker().get(0).window().zone());
-
-        assertTrue(spec.changeBlocker().get(1).blocksVersions());
-        assertFalse(spec.changeBlocker().get(1).blocksRevisions());
-        assertEquals(ZoneId.of("CET"), spec.changeBlocker().get(1).window().zone());
-
-        assertTrue(spec.canUpgradeAt(Instant.parse("2017-09-18T14:15:30.00Z")));
-        assertFalse(spec.canUpgradeAt(Instant.parse("2017-09-18T15:15:30.00Z")));
-        assertFalse(spec.canUpgradeAt(Instant.parse("2017-09-18T16:15:30.00Z")));
-        assertTrue(spec.canUpgradeAt(Instant.parse("2017-09-18T17:15:30.00Z")));
-
-        assertTrue(spec.canUpgradeAt(Instant.parse("2017-09-23T09:15:30.00Z")));
-        assertFalse(spec.canUpgradeAt(Instant.parse("2017-09-23T08:15:30.00Z"))); // 10 in CET
-        assertTrue(spec.canUpgradeAt(Instant.parse("2017-09-23T10:15:30.00Z")));
-    }
-
     @Test(expected = IllegalArgumentException.class)
     public void deploymentSpecWithIllegallyOrderedDeploymentSpec1() {
         StringReader r = new StringReader(
diff --git a/config-model/src/main/resources/schema/deployment.rnc b/config-model/src/main/resources/schema/deployment.rnc
index 4fc34862365..b2c3dcf7b5a 100644
--- a/config-model/src/main/resources/schema/deployment.rnc
+++ b/config-model/src/main/resources/schema/deployment.rnc
@@ -12,7 +12,6 @@ start = element deployment {
    Notifications? &
    Test? &
    Staging? &
-   BlockUpgrade* &
    Prod*
 }
 
@@ -28,12 +27,6 @@ BlockChange = element block-change {
     attribute time-zone { xsd:string }?
 }
 
-BlockUpgrade = element block-upgrade { # Legacy name - remove on Vespa 7
-    attribute days { xsd:string } &
-    attribute hours { xsd:string } &
-    attribute time-zone { xsd:string }?
-}
-
 Notifications = element notifications {
     attribute when { xsd:string }? &
     Email*
diff --git a/config-model/src/test/schema-test-files/deployment.xml b/config-model/src/test/schema-test-files/deployment.xml
index 15f8c969f04..ea65dbec661 100644
--- a/config-model/src/test/schema-test-files/deployment.xml
+++ b/config-model/src/test/schema-test-files/deployment.xml
@@ -5,7 +5,6 @@
     <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' athenz-service='other-service'>
         <region active='true'>us-west-1</region>
         <delay hours='3'/>