summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2017-10-16 15:21:13 +0200
committerMartin Polden <mpolden@mpolden.no>2017-10-16 15:21:13 +0200
commit5b08886871690ba8bcff448107db9a6a51ce3132 (patch)
tree51c93fd00113ac51582deeb97ff6e7a7dd4a0e03 /config-model
parente3d1a5add50869add4379eb9021a7c3533774534 (diff)
Let block-upgrade continue to work
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/resources/schema/deployment.rnc4
-rw-r--r--config-model/src/test/schema-test-files/deployment.xml1
2 files changed, 4 insertions, 1 deletions
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'/>