diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2019-11-29 19:13:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-29 19:13:36 +0100 |
| commit | 12fcbd278a5fadb085456f0cde9059755c0fe231 (patch) | |
| tree | 4023bb0e6c835026ffb18f5f00580121455a906c /config-model/src/main/resources | |
| parent | 21620abb46bbfb18abeb6c8cc917b39fb0e316b8 (diff) | |
Revert "Jvenstad/test steps in deployment spec"
Diffstat (limited to 'config-model/src/main/resources')
| -rw-r--r-- | config-model/src/main/resources/schema/deployment.rnc | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/config-model/src/main/resources/schema/deployment.rnc b/config-model/src/main/resources/schema/deployment.rnc index 6a8bc8f77b9..1e1d9ad3aa9 100644 --- a/config-model/src/main/resources/schema/deployment.rnc +++ b/config-model/src/main/resources/schema/deployment.rnc @@ -25,11 +25,6 @@ StepExceptInstance = Staging? & Prod* -PrimitiveStep = - Delay* & - Region* & - ProdTest* - Instance = element instance { attribute id { xsd:string } & attribute athenz-domain { xsd:string }? & @@ -37,14 +32,8 @@ Instance = element instance { StepExceptInstance } -ParallelSteps = element parallel { - SerialSteps* & - PrimitiveStep* -} - -SerialSteps = element steps { - ParallelSteps* & - PrimitiveStep* +ParallelRegions = element parallel { + Region* } ParallelInstances = element parallel { @@ -92,17 +81,11 @@ Prod = element prod { attribute tester-flavor { xsd:string }? & Region* & Delay* & - ProdTest* & - ParallelSteps* -} - -ProdTest = element test { - text + ParallelRegions* } Region = element region { attribute active { xsd:boolean } & - attribute athenz-service { xsd:string }? & text } |