Skip to content

Commit

Permalink
Merge pull request #31919 from vespa-engine/bjormel/New-tester-syntax
Browse files Browse the repository at this point in the history 
New tester syntax
  • Loading branch information
@jonmv
jonmv authored Aug 5, 2024
2 parents 687b93a + 4da6892 commit 56e67af
Showing 1 changed file with 36 additions and 12 deletions.
48 changes: 36 additions & 12 deletions config-application-package/src/test/resources/complex-app/deployment.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,46 @@

<parallel>
<instance id="instance0" cloud-account="417744444827">
<test tester-flavor="d-8-16-10" />
<test>
<tester>
<nodes count="1">
<resources vcpu="8" memory="16Gb" disk="10Gb" />
</nodes>
</tester>
</test>
<block-change version="true" revision="false" days="mon-fri,sun" hours="4-23" time-zone="UTC" />
</instance>

<instance id="instance1" cloud-account="417744444827">
<test tester-flavor="d-8-16-10" />
<test>
<tester>
<nodes count="1">
<resources vcpu="8" memory="16Gb" disk="10Gb" />
</nodes>
</tester>
</test>
<block-change version="true" revision="false" days="mon-fri,sun" hours="4-23" time-zone="UTC" />
</instance>

<instance id="instance2" cloud-account="417744444827">
<test tester-flavor="d-8-16-10" />
<test>
<tester>
<nodes count="1">
<resources vcpu="8" memory="16Gb" disk="10Gb" />
</nodes>
</tester>
</test>
<block-change version="true" revision="false" days="mon-fri,sun" hours="4-23" time-zone="UTC" />
</instance>

<instance id="instance3" cloud-account="417744444827">
<test tester-flavor="d-8-16-10" />
<test>
<tester>
<nodes count="1">
<resources vcpu="8" memory="16Gb" disk="10Gb" />
</nodes>
</tester>
</test>
<block-change version="true" revision="false" days="mon-fri,sun" hours="4-23" time-zone="UTC" />
</instance>

Expand All @@ -33,7 +57,7 @@
<instance id="beta1" cloud-account="417744444827" tags="beta beta-prod beta-prod-cd">
<block-change version="true" revision="false" days="mon-fri,sun" hours="4-23" time-zone="UTC" />
<block-change version="true" revision="false" days="sat" hours="0-23" time-zone="UTC" />
<upgrade revision-change='when-clear' rollout='separate' revision-target='next' policy='conservative'/>
<upgrade revision-change="when-clear" rollout="separate" revision-target="next" policy="conservative"/>
<prod>
<parallel>
<steps>
Expand All @@ -59,7 +83,7 @@
<instance id="gamma5" cloud-account="417744444827" tags="gamma prod beta-prod beta-prod-cd">
<block-change version="true" revision="false" days="mon-fri,sun" hours="4-23" time-zone="UTC" />
<block-change version="true" revision="false" days="sat" hours="0-23" time-zone="UTC" />
<upgrade revision-change='when-clear' rollout='separate' revision-target='next' policy='conservative'/>
<upgrade revision-change="when-clear" rollout="separate" revision-target="next" policy="conservative"/>
<prod>
<parallel>
<steps>
Expand All @@ -85,7 +109,7 @@
<instance id="delta21" cloud-account="417744444827" tags="delta prod beta-prod beta-prod-cd">
<block-change version="true" revision="false" days="mon-fri,sun" hours="4-23" time-zone="UTC" />
<block-change version="true" revision="false" days="sat" hours="0-23" time-zone="UTC" />
<upgrade revision-change='when-clear' rollout='separate' revision-target='next' policy='conservative'/>
<upgrade revision-change="when-clear" rollout="separate" revision-target="next" policy="conservative"/>
<prod>
<parallel>
<steps>
Expand All @@ -111,31 +135,31 @@
<instance id="prod21a" cloud-account="417744444827" tags="prod-a prod beta-prod beta-prod-cd">
<block-change version="true" revision="false" days="mon-fri,sun" hours="4-23" time-zone="UTC" />
<block-change version="true" revision="false" days="sat" hours="0-23" time-zone="UTC" />
<upgrade revision-change='when-clear' rollout='separate' revision-target='next' policy='conservative'/>
<upgrade revision-change="when-clear" rollout="separate" revision-target="next" policy="conservative"/>
</instance>

<instance id="prod21b" cloud-account="417744444827" tags="prod-b prod beta-prod beta-prod-cd">
<block-change version="true" revision="false" days="mon-fri,sun" hours="4-23" time-zone="UTC" />
<block-change version="true" revision="false" days="sat" hours="0-23" time-zone="UTC" />
<upgrade revision-change='when-clear' rollout='separate' revision-target='next' policy='conservative'/>
<upgrade revision-change="when-clear" rollout="separate" revision-target="next" policy="conservative"/>
</instance>

<instance id="prod21c" cloud-account="417744444827" tags="prod-c prod beta-prod beta-prod-cd">
<block-change version="true" revision="false" days="mon-fri,sun" hours="4-23" time-zone="UTC" />
<block-change version="true" revision="false" days="sat" hours="0-23" time-zone="UTC" />
<upgrade revision-change='when-clear' rollout='separate' revision-target='next' policy='conservative'/>
<upgrade revision-change="when-clear" rollout="separate" revision-target="next" policy="conservative"/>
</instance>

<instance id="cd10" cloud-account="417744444827" tags="cd beta-prod-cd">
<block-change version="true" revision="false" days="mon-fri,sun" hours="4-23" time-zone="UTC" />
<block-change version="true" revision="false" days="sat" hours="0-23" time-zone="UTC" />
<upgrade revision-change='when-clear' rollout='separate' revision-target='next' policy='conservative'/>
<upgrade revision-change="when-clear" rollout="separate" revision-target="next" policy="conservative"/>
</instance>

<instance id="prod1" cloud-account="417744444827">
<block-change version="true" revision="false" days="mon-fri,sun" hours="4-23" time-zone="UTC" />
<block-change version="true" revision="false" days="sat" hours="0-23" time-zone="UTC" />
<upgrade revision-change='when-clear' rollout='separate' revision-target='next' policy='conservative'/>
<upgrade revision-change="when-clear" rollout="separate" revision-target="next" policy="conservative"/>
</instance>

</deployment>

0 comments on commit 56e67af

Please sign in to comment.