diff options
| author | Martin Polden <mpolden@mpolden.no> | 2017-09-26 09:36:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-26 09:36:07 +0200 |
| commit | 781c00357f4666519cf7f0f3f42f9ee91f126610 (patch) | |
| tree | d5d0aad8eec1561530d3f1d9d28e1b0058013dcd /config-model | |
| parent | af3e3e4200597607ca91678fe4ba4869dc7a65f9 (diff) | |
| parent | ead78d5471aa24d3a2df6da36ec258bfdde74fda (diff) | |
Merge pull request #3517 from vespa-engine/mpolden/deployment-spec-block-upgrade
Read block-upgrade tag from deployment spec
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/resources/schema/deployment.rnc | 7 | ||||
| -rw-r--r-- | config-model/src/test/schema-test-files/deployment.xml | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/config-model/src/main/resources/schema/deployment.rnc b/config-model/src/main/resources/schema/deployment.rnc index 36897643964..31212b7f69d 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? & + BlockUpgrade* & Test? & Staging? & Prod* @@ -14,6 +15,12 @@ Upgrade = element upgrade { attribute policy { xsd:string } } +BlockUpgrade = element block-upgrade { + attribute days { xsd:string } & + attribute hours { xsd:string } & + attribute time-zone { xsd:string }? +} + 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 99b1dc1be69..6f16817e627 100644 --- a/config-model/src/test/schema-test-files/deployment.xml +++ b/config-model/src/test/schema-test-files/deployment.xml @@ -1,6 +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"/> <test/> <staging/> <prod global-service-id='qrs'> |