Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Misc/layoutbin/update.sh.template
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ date "+[%F %T-%4N] Waiting for $runnerprocessname ($runnerpid) to complete" >> "
while [ -e /proc/$runnerpid ]
do
date "+[%F %T-%4N] Process $runnerpid still running" >> "$logfile" 2>&1
"$rootfolder"/safe_sleep.sh 2
sleep 2
done
date "+[%F %T-%4N] Process $runnerpid finished running" >> "$logfile" 2>&1

# start re-organize folders
date "+[%F %T-%4N] Sleep 1 more second to make sure process exited" >> "$logfile" 2>&1
"$rootfolder"/safe_sleep.sh 1
sleep 1

# the folder structure under runner root will be
# ./bin -> bin.2.100.0 (junction folder)
Expand Down
8 changes: 4 additions & 4 deletions src/Misc/layoutroot/run-helper.sh.template
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ if [ ! -z "$RUNNER_WAIT_FOR_DOCKER_IN_SECONDS" ]; then
echo "Docker is ready."
break
fi
"$DIR"/safe_sleep.sh 1
sleep 1
done
fi
fi
Expand All @@ -44,7 +44,7 @@ elif [[ $returnCode == 1 ]]; then
exit 0
elif [[ $returnCode == 2 ]]; then
echo "Runner listener exit with retryable error, re-launch runner in 5 seconds."
"$DIR"/safe_sleep.sh 5
sleep 5
exit 2
elif [[ $returnCode == 3 ]]; then
# Wait for 30 seconds or for flag file to exists for the runner update process finish
Expand All @@ -55,7 +55,7 @@ elif [[ $returnCode == 3 ]]; then
rm "$updateFile"
break
fi
"$DIR"/safe_sleep.sh 1
sleep 1
done
exit 2
elif [[ $returnCode == 4 ]]; then
Expand All @@ -67,7 +67,7 @@ elif [[ $returnCode == 4 ]]; then
rm "$updateFile"
break
fi
"$DIR"/safe_sleep.sh 1
sleep 1
done
exit 2
elif [[ $returnCode == 5 ]]; then
Expand Down
37 changes: 0 additions & 37 deletions src/Misc/layoutroot/safe_sleep.sh

This file was deleted.

1 change: 0 additions & 1 deletion src/dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ function layout ()
chmod +x "${LAYOUT_DIR}/bin/Runner.Worker"
chmod +x "${LAYOUT_DIR}/bin/Runner.PluginHost"
chmod +x "${LAYOUT_DIR}/bin/installdependencies.sh"
chmod +x "${LAYOUT_DIR}/safe_sleep.sh"
fi

heading "Setup externals folder for $RUNTIME_ID runner's layout"
Expand Down