Handles gatling runner fail scenario

Signed-off-by: Yoichi Kawasaki <[email protected]>

Author: yokawasa

pkg/cloudstorages/aws.go

@@ -29,6 +29,10 @@ func (p *AWSCloudStorageProvider) GetGatlingTransferResultCommand(resultsDirecto
 RESULTS_DIR_PATH=%s
 rclone config create s3 s3 env_auth=true region %s
 while true; do
+  if [ -f "${RESULTS_DIR_PATH}/FAILED" ]; then
+    echo "Skip transfering gatling results"
+    break
+  fi
   if [ -f "${RESULTS_DIR_PATH}/COMPLETED" ]; then
     for source in $(find ${RESULTS_DIR_PATH} -type f -name *.log)
     do

pkg/cloudstorages/aws_test.go

@@ -85,6 +85,10 @@ var _ = Describe("GetGatlingTransferResultCommand", func() {
 RESULTS_DIR_PATH=testResultsDirectoryPath
 rclone config create s3 s3 env_auth=true region ap-northeast-1
 while true; do
+  if [ -f "${RESULTS_DIR_PATH}/FAILED" ]; then
+    echo "Skip transfering gatling results"
+    break
+  fi
   if [ -f "${RESULTS_DIR_PATH}/COMPLETED" ]; then
     for source in $(find ${RESULTS_DIR_PATH} -type f -name *.log)
     do

pkg/cloudstorages/azure.go

@@ -44,6 +44,10 @@ export RCLONE_AZUREBLOB_SAS_URL=${AZUREBLOB_SAS_URL}
 RESULTS_DIR_PATH=%s
 rclone config create az azureblob env_auth=true
 while true; do
+  if [ -f "${RESULTS_DIR_PATH}/FAILED" ]; then
+    echo "Skip transfering gatling results"
+    break
+  fi
   if [ -f "${RESULTS_DIR_PATH}/COMPLETED" ]; then
     for source in $(find ${RESULTS_DIR_PATH} -type f -name *.log)
     do

pkg/cloudstorages/azure_test.go

@@ -105,6 +105,10 @@ export RCLONE_AZUREBLOB_SAS_URL=${AZUREBLOB_SAS_URL}
 RESULTS_DIR_PATH=%s
 rclone config create az azureblob env_auth=true
 while true; do
+  if [ -f "${RESULTS_DIR_PATH}/FAILED" ]; then
+    echo "Skip transfering gatling results"
+    break
+  fi
   if [ -f "${RESULTS_DIR_PATH}/COMPLETED" ]; then
     for source in $(find ${RESULTS_DIR_PATH} -type f -name *.log)
     do

pkg/cloudstorages/gcp.go

@@ -31,6 +31,10 @@ RESULTS_DIR_PATH=%s
 # assumes gcs bucket using uniform bucket-level access control
 rclone config create gs "google cloud storage" bucket_policy_only true --non-interactive
 while true; do
+  if [ -f "${RESULTS_DIR_PATH}/FAILED" ]; then
+    echo "Skip transfering gatling results"
+    break
+  fi
   if [ -f "${RESULTS_DIR_PATH}/COMPLETED" ]; then
     # assumes each pod only contain single gatling log file but use for loop to use find command result
     for source in $(find ${RESULTS_DIR_PATH} -type f -name *.log)

pkg/cloudstorages/gcp_test.go

@@ -86,6 +86,10 @@ RESULTS_DIR_PATH=testResultsDirectoryPath
 # assumes gcs bucket using uniform bucket-level access control
 rclone config create gs "google cloud storage" bucket_policy_only true --non-interactive
 while true; do
+  if [ -f "${RESULTS_DIR_PATH}/FAILED" ]; then
+    echo "Skip transfering gatling results"
+    break
+  fi
   if [ -f "${RESULTS_DIR_PATH}/COMPLETED" ]; then
     # assumes each pod only contain single gatling log file but use for loop to use find command result
     for source in $(find ${RESULTS_DIR_PATH} -type f -name *.log)

pkg/commands/commands.go

@@ -41,6 +41,7 @@ TEMP_SIMULATIONS_DIR_PATH=%s
 RESOURCES_DIR_PATH=%s
 RESULTS_DIR_PATH=%s
 START_TIME="%s"
+RUN_STATUS_FILE="${RESULTS_DIR_PATH}/COMPLETED"
 if [ -z "${START_TIME}" ]; then
   START_TIME=$(date +"%%Y-%%m-%%d %%H:%%M:%%S" --utc)
 fi
@@ -67,9 +68,11 @@ if [ ! -d ${RESULTS_DIR_PATH} ]; then
 fi
 gatling.sh -sf ${SIMULATIONS_DIR_PATH} -s %s -rsf ${RESOURCES_DIR_PATH} -rf ${RESULTS_DIR_PATH} %s
 
-if [ $? -eq 0 ]; then
-  touch ${RESULTS_DIR_PATH}/COMPLETED
+if [ $? -ne 0 ]; then
+  RUN_STATUS_FILE="${RESULTS_DIR_PATH}/FAILED"
+  echo "gatling.sh has failed!" 1>&2
 fi
+touch ${RUN_STATUS_FILE}
 `
 	generateLocalReportOption := "-nr"
 	if generateLocalReport {

pkg/commands/commands_test.go

@@ -58,6 +58,7 @@ TEMP_SIMULATIONS_DIR_PATH=testTempSimulationsDirectoryPath
 RESOURCES_DIR_PATH=testResourcesDirectoryPath
 RESULTS_DIR_PATH=testResultsDirectoryPath
 START_TIME="2021-09-10 08:45:31"
+RUN_STATUS_FILE="${RESULTS_DIR_PATH}/COMPLETED"
 if [ -z "${START_TIME}" ]; then
   START_TIME=$(date +"%Y-%m-%d %H:%M:%S" --utc)
 fi
@@ -84,9 +85,11 @@ if [ ! -d ${RESULTS_DIR_PATH} ]; then
 fi
 gatling.sh -sf ${SIMULATIONS_DIR_PATH} -s testSimulationClass -rsf ${RESOURCES_DIR_PATH} -rf ${RESULTS_DIR_PATH} 
 
-if [ $? -eq 0 ]; then
-  touch ${RESULTS_DIR_PATH}/COMPLETED
+if [ $? -ne 0 ]; then
+  RUN_STATUS_FILE="${RESULTS_DIR_PATH}/FAILED"
+  echo "gatling.sh has failed!" 1>&2
 fi
+touch ${RUN_STATUS_FILE}
 `
 		Expect(GetGatlingRunnerCommand(simulationsDirectoryPath, tempSimulationsDirectoryPath, resourcesDirectoryPath, resultsDirectoryPath, startTime, simulationClass, generateLocalReport)).To(Equal(expectedValue))
 	})
@@ -99,6 +102,7 @@ TEMP_SIMULATIONS_DIR_PATH=testTempSimulationsDirectoryPath
 RESOURCES_DIR_PATH=testResourcesDirectoryPath
 RESULTS_DIR_PATH=testResultsDirectoryPath
 START_TIME="2021-09-10 08:45:31"
+RUN_STATUS_FILE="${RESULTS_DIR_PATH}/COMPLETED"
 if [ -z "${START_TIME}" ]; then
   START_TIME=$(date +"%Y-%m-%d %H:%M:%S" --utc)
 fi
@@ -125,9 +129,11 @@ if [ ! -d ${RESULTS_DIR_PATH} ]; then
 fi
 gatling.sh -sf ${SIMULATIONS_DIR_PATH} -s testSimulationClass -rsf ${RESOURCES_DIR_PATH} -rf ${RESULTS_DIR_PATH} -nr
 
-if [ $? -eq 0 ]; then
-	touch ${RESULTS_DIR_PATH}/COMPLETED
+if [ $? -ne 0 ]; then
+  RUN_STATUS_FILE="${RESULTS_DIR_PATH}/FAILED"
+  echo "gatling.sh has failed!" 1>&2
 fi
+touch ${RUN_STATUS_FILE}
 `
 		Expect(GetGatlingRunnerCommand(simulationsDirectoryPath, tempSimulationsDirectoryPath, resourcesDirectoryPath, resultsDirectoryPath, startTime, simulationClass, generateLocalReport)).To(Equal(expectedValue))
 	})