Skip to content

Commit 0f21714

Browse files
copy-results/add-retry-and-timeout
1 parent 63d7c55 commit 0f21714

File tree

2 files changed

+19
-2
lines changed

2 files changed

+19
-2
lines changed

app/util/k8s/bzt_on_pod.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,15 @@ kubectl exec -it "$exec_pod_name" -n atlassian -- docker run --shm-size=4g -v "/
6767
sleep 10
6868

6969
echo "INFO: Copy results folder from the exec env pod to local"
70-
kubectl exec -n atlassian "$exec_pod_name" -- tar cf - -C /dc-app-performance-toolkit/app results | tar xf - -C /data-center-terraform/dc-app-performance-toolkit/app/results --strip-components=1
70+
for _ in {1..3}; do
71+
if kubectl exec -n atlassian "$exec_pod_name" --request-timeout=60s -- tar czf - -C /dc-app-performance-toolkit/app results | tar xzf - -C /data-center-terraform/dc-app-performance-toolkit/app/results --strip-components=1; then
72+
break
73+
else
74+
echo "Copying failed, retrying..."
75+
sleep 5
76+
fi
77+
done
78+
7179
if [[ $? -ne 0 ]]; then
7280
echo "ERROR: Copy results folder failed"
7381
exit 1

app/util/k8s/copy_run_results.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,16 @@ fi
3030
echo "INFO: Execution environment pod name: $exec_pod_name"
3131

3232
echo "INFO: Copy results folder from the exec env pod to local"
33-
kubectl exec -n atlassian "$exec_pod_name" -- tar cf - -C /dc-app-performance-toolkit/app results | tar xf - -C /data-center-terraform/dc-app-performance-toolkit/app/results --strip-components=1
33+
34+
for _ in {1..3}; do
35+
if kubectl exec -n atlassian "$exec_pod_name" --request-timeout=60s -- tar czf - -C /dc-app-performance-toolkit/app results | tar xzf - -C /data-center-terraform/dc-app-performance-toolkit/app/results --strip-components=1; then
36+
break
37+
else
38+
echo "Copying failed, retrying..."
39+
sleep 5
40+
fi
41+
done
42+
3443
if [[ $? -ne 0 ]]; then
3544
echo "ERROR: Copy results folder failed"
3645
exit 1

0 commit comments

Comments
 (0)