Skip to content

Commit 89a95bb

Browse files
authored
calling cci APIs can take time so don't use loop_time as increment (#23)
use wall clock instead to calculate wait_time
1 parent 0dd26b4 commit 89a95bb

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/scripts/global-queue.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,14 +131,16 @@ load_variables
131131
max_time=${CONFIG_TIME}
132132
echo "This build will block until all previous builds complete."
133133
echo "Max Queue Time: ${max_time} minutes."
134-
wait_time=0
134+
wait_start_time=$(date +%s)
135135
loop_time=11
136136
max_time_seconds=$((max_time * 60))
137137

138138
# queue loop
139139
confidence=0
140140
while true; do
141141
update_comparables
142+
now=$(date +%s)
143+
wait_time=$((now - wait_start_time))
142144
echo "This Workflow Timestamp: ${my_commit_time}"
143145
echo "Oldest Workflow Timestamp: ${oldest_commit_time}"
144146
if [[ -n "${my_commit_time}" ]] && [[ "${oldest_commit_time}" > "${my_commit_time}" || "${oldest_commit_time}" = "${my_commit_time}" ]] ; then
@@ -173,5 +175,4 @@ while true; do
173175
fi
174176

175177
sleep $loop_time
176-
wait_time=$(( loop_time + wait_time ))
177178
done

src/scripts/pipeline-queue.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,15 @@ update_comparables(){
6363

6464
load_variables
6565
echo "This build will block until all previous builds complete."
66-
wait_time=0
66+
wait_start_time=$(date +%s)
6767
loop_time=11
6868

6969
# queue loop
7070
confidence=0
7171
while true; do
7272
update_comparables
73+
now=$(date +%s)
74+
wait_time=$(( now - wait_start_time ))
7375

7476
# if we have no running workflows, check confidence, and move to front of line.
7577
if [[ "${running_workflows}" -eq 0 ]] ; then
@@ -90,5 +92,4 @@ while true; do
9092
fi
9193

9294
sleep $loop_time
93-
wait_time=$(( loop_time + wait_time ))
9495
done

0 commit comments

Comments
 (0)