Merge pull request #1687 from atlassian/results/improve-results-copying

results/improve-results-copying

Author: OlehStefanyshyn

app/util/k8s/bzt_on_pod.sh

@@ -50,9 +50,8 @@ echo "INFO: Copy latest dc-app-performance-toolkit folder to the exec env pod"
 start=$(date +%s)
 # tar only app folder, exclude results and util/k8s folder
 tar -czf dcapt.tar.gz -C dc-app-performance-toolkit --exclude results --exclude util/k8s app Dockerfile requirements.txt
-kubectl cp --retries 10 dcapt.tar.gz atlassian/"$exec_pod_name":/dcapt.tar.gz
 kubectl exec -it "$exec_pod_name" -n atlassian -- mkdir /dc-app-performance-toolkit
-kubectl exec -it "$exec_pod_name" -n atlassian -- tar -xf /dcapt.tar.gz -C /dc-app-performance-toolkit
+cat dcapt.tar.gz | kubectl exec -i -n atlassian "$exec_pod_name" -- tar xzf - -C /dc-app-performance-toolkit
 rm -rf dcapt.tar.gz
 end=$(date +%s)
 runtime=$((end-start))
@@ -68,7 +67,7 @@ kubectl exec -it "$exec_pod_name" -n atlassian -- docker run --shm-size=4g -v "/
 sleep 10
 
 echo "INFO: Copy results folder from the exec env pod to local"
-kubectl cp --retries 10 atlassian/"$exec_pod_name":dc-app-performance-toolkit/app/results dc-app-performance-toolkit/app/results
+kubectl exec -n atlassian "$exec_pod_name" -- tar cf - /dc-app-performance-toolkit/app/results | tar xf - -C /dc-app-performance-toolkit/app/results
 if [[ $? -ne 0 ]]; then
     echo "ERROR: Copy results folder failed"
     exit 1

app/util/k8s/copy_run_results.sh

@@ -30,7 +30,7 @@ fi
 echo "INFO: Execution environment pod name: $exec_pod_name"
 
 echo "INFO: Copy results folder from the exec env pod to local"
-kubectl cp --retries 100 atlassian/"$exec_pod_name":dc-app-performance-toolkit/app/results dc-app-performance-toolkit/app/results
+kubectl exec -n atlassian "$exec_pod_name" -- tar cf - /dc-app-performance-toolkit/app/results | tar xf - -C /dc-app-performance-toolkit/app/results
 if [[ $? -ne 0 ]]; then
     echo "ERROR: Copy results folder failed"
     exit 1