summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2017-05-09 10:47:44 +0200
committerJon Bratseth <bratseth@yahoo-inc.com>2017-05-09 10:47:44 +0200
commit20b6883ae868ca9d9e5e7b7050fea3150f30d4e7 (patch)
tree2346fe2e9f4232001cce3ba170eb7e12a72dbf16
parentd8dfc4f76766cf313d19693aa0b9c971d2a30f4e (diff)
Add upgrade to deployment.xml schema + deployment test
-rw-r--r--config-model/src/main/resources/schema/deployment.rnc5
-rw-r--r--config-model/src/test/schema-test-files/deployment.xml10
-rwxr-xr-xconfig-model/src/test/sh/test-schema.sh4
3 files changed, 19 insertions, 0 deletions
diff --git a/config-model/src/main/resources/schema/deployment.rnc b/config-model/src/main/resources/schema/deployment.rnc
index 22ceab4efa5..c8bd11d7184 100644
--- a/config-model/src/main/resources/schema/deployment.rnc
+++ b/config-model/src/main/resources/schema/deployment.rnc
@@ -3,11 +3,16 @@
start = element deployment {
attribute version { "1.0" } &
+ Upgrade? &
Test? &
Staging? &
Prod*
}
+Upgrade = element upgrade {
+ attribute policy { 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
new file mode 100644
index 00000000000..92d59abbe53
--- /dev/null
+++ b/config-model/src/test/schema-test-files/deployment.xml
@@ -0,0 +1,10 @@
+<deployment version='1.0'>
+ <upgrade policy='canary'/>
+ <test/>
+ <staging/>
+ <prod global-service-id='qrs'>
+ <region active='true'>us-west-1</region>
+ <region active='true'>us-central-1</region>
+ <region active='true'>us-east-3</region>
+ </prod>
+</deployment>
diff --git a/config-model/src/test/sh/test-schema.sh b/config-model/src/test/sh/test-schema.sh
index fa7bcc54121..0ee73ffc3e3 100755
--- a/config-model/src/test/sh/test-schema.sh
+++ b/config-model/src/test/sh/test-schema.sh
@@ -27,3 +27,7 @@ $cmd
cmd="java -jar $jar src/main/resources/schema/services.rng src/test/schema-test-files/services-hosted-infrastructure.xml"
echo $cmd
$cmd
+
+cmd="java -jar $jar src/main/resources/schema/deployment.rng src/test/schema-test-files/deployment.xml"
+echo $cmd
+$cmd