Bug 496282 - Simplify "collect and process tests" logic to avoid "cron

job" on Releng HIPP 

- this is two stage fix. currently the file is taken as input for
collect.sh. this needs to change to accept command line arguments. Then
change the ep-collectResults job to call collect.sh directly. Instead of
having a file generated and running another cronjob.

This fixes the first part accepting the command line arguments. Once
this goes in I will make change to the ep-collectResults job.
This will get reduced to <path to collect.sh>/collect.sh $triggeringJob
$triggeringBuildNumber $buildId $eclipseStream $EBUILDER_HASH 

Change-Id: Ia59251dc1a86569111e316117304517feae97c80
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>

2 files changed, 7 insertions, 11 deletions

diff --git a/production/sdk/collect.sh b/production/sdk/collect.sh
index 2f9bf0135..a72b01338 100755
--- a/production/sdk/collect.sh
+++ b/production/sdk/collect.sh
@@ -42,15 +42,11 @@ export ANT_HOME=/shared/common/apache-ant-1.9.6
 
 export PATH=${JAVA_HOME}/bin:${ANT_HOME}/bin:$PATH
 
-read inputline
-echo " = = Properties in collect.sh == "
-echo "inputline: $inputline"
-
-job="$(echo $inputline | cut -d\  -f1)"
-buildNumber="$(echo $inputline | cut -d\  -f2)"
-buildId="$(echo $inputline | cut -d\  -f3)"
-eclipseStream="$(echo $inputline | cut -d\  -f4)"
-EBUILDER_HASH="$(echo $inputline | cut -d\  -f5)"
+job=$1
+buildNumber=$2
+buildId=$3
+eclipseStream=$4
+EBUILDER_HASH=$5
 
 echo "job: $job"
 echo "buildNumber: $buildNumber"
diff --git a/production/sdk/testdataCronJob.sh b/production/sdk/testdataCronJob.sh
index 244c015f4..c789145df 100755
--- a/production/sdk/testdataCronJob.sh
+++ b/production/sdk/testdataCronJob.sh
@@ -89,9 +89,9 @@ do
       # will be part of Hudson's log.
       if [[ "${RUNNING_ON_HUDSON}" == "false" ]]
       then
-        /bin/bash ${UTILITIES_HOME}/sdk/collect.sh < $runningdatafile 1>>$testdataLocation/collection-out.txt 2>>$testdataLocation/collection-err.txt
+        /bin/bash ${UTILITIES_HOME}/sdk/collect.sh $(cat $runningdatafile) 1>>$testdataLocation/collection-out.txt 2>>$testdataLocation/collection-err.txt
       else
-        /bin/bash ${UTILITIES_HOME}/sdk/collect.sh < $runningdatafile
+        /bin/bash ${UTILITIES_HOME}/sdk/collect.sh $($runningdatafile)
       fi
       # to test cron job, without doing anything, comment out above line, and uncomment folloiwng line.
       # then try various types of files file names, etc.