diff options
| author | Martin Polden <mpolden@mpolden.no> | 2023-07-27 12:21:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-27 12:21:14 +0200 |
| commit | 2921d5bc1358b094db2e131970c969dcad481502 (patch) | |
| tree | 2ffff84602408dd610cc27b56bcca024ad33ccbf /config-model/src/test/cfg | |
| parent | 2b43a46817cc779dccedd82ea8460802367a448a (diff) | |
Revert "Remove global-service-id"
Diffstat (limited to 'config-model/src/test/cfg')
4 files changed, 13 insertions, 13 deletions
diff --git a/config-model/src/test/cfg/application/app1/deployment.xml b/config-model/src/test/cfg/application/app1/deployment.xml index 25954df1c7d..a8771123ecc 100644 --- a/config-model/src/test/cfg/application/app1/deployment.xml +++ b/config-model/src/test/cfg/application/app1/deployment.xml @@ -2,8 +2,8 @@ <deployment version="1.0"> <test/> <staging/> - <prod> - <region>us-east-3</region> - <region>us-west-1</region> + <prod global-service-id="query"> + <region active="true">us-east-3</region> + <region active="false">us-west-1</region> </prod> </deployment> diff --git a/config-model/src/test/cfg/application/app_complicated_deployment_spec/deployment.xml b/config-model/src/test/cfg/application/app_complicated_deployment_spec/deployment.xml index e30c02cdd84..3d3bfd35845 100644 --- a/config-model/src/test/cfg/application/app_complicated_deployment_spec/deployment.xml +++ b/config-model/src/test/cfg/application/app_complicated_deployment_spec/deployment.xml @@ -5,24 +5,24 @@ <instance id='instance' athenz-service='in-service'> <prod> <parallel> - <region>us-west-1</region> + <region active='true'>us-west-1</region> <steps> - <region>us-east-3</region> + <region active='true'>us-east-3</region> <delay hours='2' /> - <region>eu-west-1</region> + <region active='true'>eu-west-1</region> <delay hours='2' /> </steps> <steps> <delay hours='3' /> - <region>aws-us-east-1a</region> + <region active='true'>aws-us-east-1a</region> <parallel> - <region athenz-service='no-service'>ap-northeast-1</region> - <region>ap-southeast-2</region> + <region active='true' athenz-service='no-service'>ap-northeast-1</region> + <region active='true'>ap-southeast-2</region> </parallel> </steps> <delay hours='3' minutes='30' /> </parallel> - <region>us-north-7</region> + <region active='true'>us-north-7</region> </prod> </instance> <instance id='other'> @@ -30,7 +30,7 @@ <block-change days='sat' hours='10' time-zone='CET' /> <test /> <prod> - <region>eu-central-2</region> + <region active='true'>eu-central-2</region> </prod> <notifications when='failing'> <email role='author' /> diff --git a/config-model/src/test/cfg/application/app_invalid_deployment_xml/deployment.xml b/config-model/src/test/cfg/application/app_invalid_deployment_xml/deployment.xml index 43f7d74ca69..738a3397aad 100644 --- a/config-model/src/test/cfg/application/app_invalid_deployment_xml/deployment.xml +++ b/config-model/src/test/cfg/application/app_invalid_deployment_xml/deployment.xml @@ -2,7 +2,7 @@ <deployment version="1.0"> <test/> <staging/> - <prod> + <prod global-service-id="query"> <region>us-east-3</region> <region invalid="invalid">us-west-1</region> </prod> diff --git a/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/deployment.xml b/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/deployment.xml index 24e1ec69507..4eaf7926078 100644 --- a/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/deployment.xml +++ b/config-model/src/test/cfg/application/invalid_parallel_deployment_xml/deployment.xml @@ -2,7 +2,7 @@ <deployment version="1.0"> <test/> <staging/> - <prod> + <prod global-service-id="query"> <parallel> <instance id="hello" /> </parallel> |