diff options
| author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-10-09 12:56:46 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-10-09 12:56:46 +0200 |
| commit | 9585c6091fbdc7cef1a95e3d05b42e155ab1c2c3 (patch) | |
| tree | 7d9822057eb839d5820c1fda35f05158e22ffd31 /config-model | |
| parent | 6cbdad174146cb1c1c847bec218790a8595f1dbf (diff) | |
block-upgrade -> block-change to support blocking revisions
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/resources/schema/deployment.rnc | 9 | ||||
| -rw-r--r-- | config-model/src/test/schema-test-files/deployment.xml | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/config-model/src/main/resources/schema/deployment.rnc b/config-model/src/main/resources/schema/deployment.rnc index 31212b7f69d..16cc3acfafa 100644 --- a/config-model/src/main/resources/schema/deployment.rnc +++ b/config-model/src/main/resources/schema/deployment.rnc @@ -5,6 +5,7 @@ start = element deployment { attribute version { "1.0" } & Upgrade? & + BlockChange* & BlockUpgrade* & Test? & Staging? & @@ -15,12 +16,18 @@ Upgrade = element upgrade { attribute policy { xsd:string } } -BlockUpgrade = element block-upgrade { +BlockChange = element block-change { + attribute revisions { xsd:boolean }? & + attribute versions { xsd:boolean }? & attribute days { xsd:string } & attribute hours { xsd:string } & attribute time-zone { xsd:string }? } +BlockUpgrade = element block-upgrade { # Legacy name - remove on Vespa 7 + BlockChange +} + Test = element test { text } diff --git a/config-model/src/test/schema-test-files/deployment.xml b/config-model/src/test/schema-test-files/deployment.xml index 6f16817e627..2fd6d7c3ec8 100644 --- a/config-model/src/test/schema-test-files/deployment.xml +++ b/config-model/src/test/schema-test-files/deployment.xml @@ -1,8 +1,8 @@ <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <deployment version='1.0'> <upgrade policy='canary'/> - <block-upgrade days="mon,tue" hours="14,15"/> - <block-upgrade days="mon,tue" hours="14,15" time-zone="CET"/> + <block-change revisions='true' versions='false' days="mon,tue" hours="14,15"/> + <block-change days="mon,tue" hours="14,15" time-zone="CET"/> <test/> <staging/> <prod global-service-id='qrs'> |