| Message ID | 20200904164258.240278-3-crosa@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | gitlab pipeline check/watch script improvements | expand |
On 9/4/20 6:42 PM, Cleber Rosa wrote: > The script has its own timeout, which is about how long the script > will wait (when called with --wait) for the pipeline to complete, and > not necessarily for the pipeline to complete. > > Hopefully this will new wording will be clearer. too many wills? > > Signed-off-by: Cleber Rosa <crosa@redhat.com> > --- > scripts/ci/gitlab-pipeline-status | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/scripts/ci/gitlab-pipeline-status b/scripts/ci/gitlab-pipeline-status > index 194dd4d0bb..2a36f74696 100755 > --- a/scripts/ci/gitlab-pipeline-status > +++ b/scripts/ci/gitlab-pipeline-status > @@ -69,7 +69,10 @@ def wait_on_pipeline_success(timeout, interval, > start = time.time() > while True: > if time.time() >= (start + timeout): > - print("Waiting on the pipeline timed out") > + msg = ("Timeout (-t/--timeout) of %i seconds reached, " > + "won't wait any longer for the pipeline to complete") > + msg %= timeout > + print(msg) Isn't it more pythonic / cheaper to declare the msg format out of the loop and call directly: print(msg % timeout) ? > return False > > status = get_pipeline_status(project_id, commit_sha) >
diff --git a/scripts/ci/gitlab-pipeline-status b/scripts/ci/gitlab-pipeline-status index 194dd4d0bb..2a36f74696 100755 --- a/scripts/ci/gitlab-pipeline-status +++ b/scripts/ci/gitlab-pipeline-status @@ -69,7 +69,10 @@ def wait_on_pipeline_success(timeout, interval, start = time.time() while True: if time.time() >= (start + timeout): - print("Waiting on the pipeline timed out") + msg = ("Timeout (-t/--timeout) of %i seconds reached, " + "won't wait any longer for the pipeline to complete") + msg %= timeout + print(msg) return False status = get_pipeline_status(project_id, commit_sha)
The script has its own timeout, which is about how long the script will wait (when called with --wait) for the pipeline to complete, and not necessarily for the pipeline to complete. Hopefully this will new wording will be clearer. Signed-off-by: Cleber Rosa <crosa@redhat.com> --- scripts/ci/gitlab-pipeline-status | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)