Index: build/unittest.sh =================================================================== diff -u -rdaccaf21e20cdf95fcd9c95678c652f1d4cff619 -ra932ef0d9158a87236e4101a7de91f02964e600d --- build/unittest.sh (.../unittest.sh) (revision daccaf21e20cdf95fcd9c95678c652f1d4cff619) +++ build/unittest.sh (.../unittest.sh) (revision a932ef0d9158a87236e4101a7de91f02964e600d) @@ -436,7 +436,7 @@ local buildWrapperJson="Build_Wrapper_JSON" local sonarLogs="SonarQubeLogs.log" local sonarRunProject="UI-SonarRun" - local inlineScriptForRepor="sonarReportGeneration.sh" + local inlineScriptForReport="sonarReportGeneration.sh" echo " ------------------------------ Running SonarQube test" echo "Current squish location $(pwd)" mkdir "$sonarFolder" @@ -447,8 +447,8 @@ cd application || return echo "New squish location $(pwd)" touch "$sonarLogs" - touch "$sonarReportGeneration" - chmod +x "$sonarReportGeneration" + touch "$inlineScriptForReport" + chmod +x "$inlineScriptForReport" ./alarmMapping.sh @@ -466,19 +466,21 @@ cp -r "$sonarLogs" "$REPORT_DIR" - echo 'cd /home/dnavaei/Downloads/SonarQube_Reports' >> "$sonarReportGeneration" - echo 'latestRunDate=$(date +%Y-%m-%d)' >> "$sonarReportGeneration" + echo 'cd /home/dnavaei/Downloads/SonarQube_Reports' >> "$inlineScriptForReport" + echo 'latestRunDate=$(date +%Y-%m-%d)' >> "$inlineScriptForReport" echo 'runReport=$(java -jar sonar-cnes-report-4.2.0.jar -p $sonarRunProject -t \ - aa04ef5851c9cd5bcaaa305e7173714a2739b3f0)' >> "$sonarReportGeneration" - echo 'docxFile=$(find $(pwd) -name "*.docx" | grep "$latestRunDate")' >> "$sonarReportGeneration" - echo 'echo $docxFile' >> "$sonarReportGeneration" + aa04ef5851c9cd5bcaaa305e7173714a2739b3f0 2>error.log)' >> "$inlineScriptForReport" + echo 'docxFile=$(find $(pwd) -name "*.docx" | grep "$latestRunDate")' >> "$inlineScriptForReport" + echo 'echo $docxFile' >> "$inlineScriptForReport" - sshpass -p "WonderFirst23@" scp "$sonarReportGeneration" dnavaei@192.168.10.41:~/ + sshpass -p "WonderFirst23@" scp "$(pwd)/$inlineScriptForReport" dnavaei@192.168.10.41:~/ - reportAddress=$(sshpass -p "WonderFirst23@" ssh -t dnavaei@192.168.10.41 ./tempScript.sh) + reportAddress=$(sshpass -p "WonderFirst23@" ssh -t dnavaei@192.168.10.41 ./"$inlineScriptForReport") echo "Here is the file I got: $reportAddress" + sshpass -p "WonderFirst23@" scp dnavaei@192.168.10.41:"$reportAddress" "$REPORT_DIR" + cd "$currentDir" || return }