From 5b96281ea6969ef9150d0d689851e47b14e96b0e Mon Sep 17 00:00:00 2001 From: Adriaan Renting <renting@astron.nl> Date: Tue, 19 Jan 2016 16:39:24 +0000 Subject: [PATCH] Task #8550: changed location of cluster keys after Nico changed MoM, as agreed --- .../xml/test_input_cep4.xml | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/SAS/XML_generator/test/test_regression.in_data/xml/test_input_cep4.xml b/SAS/XML_generator/test/test_regression.in_data/xml/test_input_cep4.xml index 6166597a7fc..a3a0f4589de 100644 --- a/SAS/XML_generator/test/test_regression.in_data/xml/test_input_cep4.xml +++ b/SAS/XML_generator/test/test_regression.in_data/xml/test_input_cep4.xml @@ -130,6 +130,16 @@ <predecessor_topology>B0.1.T</predecessor_topology> <name>Crab test/1.0/PP</name> <description>Crab test/1.0/PP (Pulsar Pipeline)</description> + <processingCluster> + <name>CEP4</name> + <partition>/data</partition> + <numberOfTasks>244</numberOfTasks> + <minRAMPerTask unit="byte">1000000000</minRAMPerTask> + <minScratchPerTask unit="byte">100000000</minScratchPerTask> + <maxDurationPerTask>PT600S</maxDurationPerTask> + <numberOfCoresPerTask>20</numberOfCoresPerTask> + <runSimultaneous>true</runSimultaneous> + </processingCluster> <pipelineAttributes> <defaultTemplate>Pulsar Pipeline</defaultTemplate> <duration>600</duration> @@ -155,16 +165,6 @@ <skipDynamicSpectrum></skipDynamicSpectrum> <skipPrepfold></skipPrepfold> <tsubint></tsubint> - <processingCluster> - <name>CEP4</name> - <partition>/data</partition> - <numberOfTasks>244</numberOfTasks> - <minRAMPerTask unit="byte">1000000000</minRAMPerTask> - <minScratchPerTask unit="byte">100000000</minScratchPerTask> - <maxDurationPerTask>PT600S</maxDurationPerTask> - <numberOfCoresPerTask>20</numberOfCoresPerTask> - <runSimultaneous>true</runSimultaneous> - </processingCluster> </pipelineAttributes> <usedDataProducts> <item> @@ -305,6 +305,16 @@ <predecessor_topology>B0.2.T</predecessor_topology> <name>Crab test/2.0/PP</name> <description>Crab test/2.0/PP (Pulsar Pipeline)</description> + <processingCluster> + <name>CEP4</name> + <partition>/data</partition> + <numberOfTasks>244</numberOfTasks> + <minRAMPerTask unit="byte">1000000000</minRAMPerTask> + <minScratchPerTask unit="byte">100000000</minScratchPerTask> + <maxDurationPerTask>PT600S</maxDurationPerTask> + <numberOfCoresPerTask>20</numberOfCoresPerTask> + <runSimultaneous>true</runSimultaneous> + </processingCluster> <pipelineAttributes> <defaultTemplate>Pulsar Pipeline</defaultTemplate> <duration>600</duration> @@ -330,16 +340,6 @@ <skipDynamicSpectrum></skipDynamicSpectrum> <skipPrepfold></skipPrepfold> <tsubint></tsubint> - <processingCluster> - <name>CEP4</name> - <partition>/data</partition> - <numberOfTasks>244</numberOfTasks> - <minRAMPerTask unit="byte">1000000000</minRAMPerTask> - <minScratchPerTask unit="byte">100000000</minScratchPerTask> - <maxDurationPerTask>PT600S</maxDurationPerTask> - <numberOfCoresPerTask>20</numberOfCoresPerTask> - <runSimultaneous>true</runSimultaneous> - </processingCluster> </pipelineAttributes> <usedDataProducts> <item> -- GitLab