diff options
| author | Jon Bratseth <bratseth@oath.com> | 2018-10-18 13:01:10 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@oath.com> | 2018-10-18 13:01:10 +0200 |
| commit | 1f4d3a897ad3250e0bcca798a76f24d78a3aac82 (patch) | |
| tree | 58a27163fd99ba7ede28d2c20424afd7309b94c8 /config-model | |
| parent | 2779d3a18fe1bdb1cccc5d0eb88bbebf92b0cb15 (diff) | |
Allow major-version in schema
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/resources/schema/deployment.rnc | 1 | ||||
| -rw-r--r-- | config-model/src/main/resources/schema/services.rnc | 2 | ||||
| -rw-r--r-- | config-model/src/test/schema-test-files/deployment.xml | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/config-model/src/main/resources/schema/deployment.rnc b/config-model/src/main/resources/schema/deployment.rnc index 2ecfa781876..6878441fe92 100644 --- a/config-model/src/main/resources/schema/deployment.rnc +++ b/config-model/src/main/resources/schema/deployment.rnc @@ -4,6 +4,7 @@ start = element deployment { attribute version { "1.0" } & + attribute major-version { text }? & attribute athenz-domain { xsd:string }? & attribute athenz-service { xsd:string }? & Upgrade? & diff --git a/config-model/src/main/resources/schema/services.rnc b/config-model/src/main/resources/schema/services.rnc index 3897448cb56..c4eb7435ca6 100644 --- a/config-model/src/main/resources/schema/services.rnc +++ b/config-model/src/main/resources/schema/services.rnc @@ -11,7 +11,7 @@ include "legacygenericcluster.rnc" start = element services { attribute version { "1.0" }? & - attribute major-version { text }? & + attribute major-version { text }? & # TODO: Remove on Vespa 7 attribute application-type { "hosted-infrastructure" }? & LegacyGenericCluster* & GenericCluster* & diff --git a/config-model/src/test/schema-test-files/deployment.xml b/config-model/src/test/schema-test-files/deployment.xml index f9a62eb648f..15f8c969f04 100644 --- a/config-model/src/test/schema-test-files/deployment.xml +++ b/config-model/src/test/schema-test-files/deployment.xml @@ -1,5 +1,5 @@ <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> -<deployment version='1.0' athenz-domain='vespa' athenz-service='service'> +<deployment version='1.0' major-version='6' athenz-domain='vespa' athenz-service='service'> <upgrade policy='canary'/> <test/> <staging/> |