1 files changed, 20 insertions, 3 deletions
diff --git a/config-model/src/main/resources/schema/deployment.rnc b/config-model/src/main/resources/schema/deployment.rnc
index 1e1d9ad3aa9..6a8bc8f77b9 100644
--- a/config-model/src/main/resources/schema/deployment.rnc
+++ b/config-model/src/main/resources/schema/deployment.rnc
@@ -25,6 +25,11 @@ StepExceptInstance =
     Staging? &
     Prod*
 
+PrimitiveStep =
+    Delay* &
+    Region* &
+    ProdTest*
+
 Instance = element instance {
    attribute id { xsd:string } &
    attribute athenz-domain { xsd:string }? &
@@ -32,8 +37,14 @@ Instance = element instance {
    StepExceptInstance
 }
 
-ParallelRegions = element parallel {
-    Region*
+ParallelSteps = element parallel {
+    SerialSteps* &
+    PrimitiveStep*
+}
+
+SerialSteps = element steps {
+    ParallelSteps* &
+    PrimitiveStep*
 }
 
 ParallelInstances = element parallel {
@@ -81,11 +92,17 @@ Prod = element prod {
    attribute tester-flavor { xsd:string }? &
    Region* &
    Delay* &
-   ParallelRegions*
+   ProdTest* &
+   ParallelSteps*
+}
+
+ProdTest = element test {
+   text
 }
 
 Region = element region {
    attribute active { xsd:boolean } &
+   attribute athenz-service { xsd:string }? &
    text
 }