Extending timeout and collecting per stack robot results
Moving the multi-stack to the DT workflow

Change-Id: I981a5a24b2c9c2b492438104e69249653a74c92f
diff --git a/jjb/pipeline/voltha-scale-multi-stack.groovy b/jjb/pipeline/voltha-scale-multi-stack.groovy
index c8c5323..b751a26 100644
--- a/jjb/pipeline/voltha-scale-multi-stack.groovy
+++ b/jjb/pipeline/voltha-scale-multi-stack.groovy
@@ -21,7 +21,7 @@
     label "${params.buildNode}"
   }
   options {
-      timeout(time: 60, unit: 'MINUTES')
+      timeout(time: 120, unit: 'MINUTES')
   }
   environment {
     JENKINS_NODE_COOKIE="dontKillMe" // do not kill processes after the build is done
@@ -420,11 +420,6 @@
             kubectl cp $INSTANCE:out.pcap $LOG_FOLDER/$INSTANCE.pcap || true
           done
         fi
-
-        cd voltha-system-tests
-        source ./vst_venv/bin/activate
-        python tests/scale/collect-result.py -r $WORKSPACE/RobotLogs/output.xml -p $WORKSPACE/plots > $WORKSPACE/execution-time.txt || true
-        cat $WORKSPACE/execution-time.txt
       '''
       sh '''
         if [ ${withProfiling} = true ] ; then
@@ -721,6 +716,10 @@
           source ./vst_venv/bin/activate
           robot -d $WORKSPACE/RobotLogs/voltha${i} \
           \$ROBOT_PARAMS tests/scale/Voltha_Scale_Tests.robot
+
+          # collect results
+          python tests/scale/collect-result.py -r $WORKSPACE/RobotLogs/voltha${i}/output.xml -p $WORKSPACE/plots > $WORKSPACE/execution-time-voltha${i}.txt || true
+          cat $WORKSPACE/execution-time-voltha${i}.txt
         """
       }
     }