From b3b017e913c90f5ad234658b7fcae310d40c31b3 Mon Sep 17 00:00:00 2001
From: Pavel Korshunov <pavel.korshunov@idiap.ch>
Date: Thu, 12 Apr 2018 14:05:46 +0200
Subject: [PATCH] ignore non-version tags, build wait time 2 hours
---
release/release_bob.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/release/release_bob.py b/release/release_bob.py
index 0e39898..647e598 100755
--- a/release/release_bob.py
+++ b/release/release_bob.py
@@ -139,7 +139,8 @@ def get_latest_tag_name(gitpkg):
if not latest_tags:
return None
# create list of tags' names but ignore the first 'v' character in each name
- tag_names = [tag.name[1:] for tag in latest_tags]
+ # also filter out non version tags
+ tag_names = [tag.name[1:] for tag in latest_tags if StrictVersion.version_re.match(tag.name[1:])]
# sort them correctly according to each subversion number
tag_names.sort(key=StrictVersion)
# take the last one, as it is the latest tag in the sorted tags
@@ -282,7 +283,7 @@ def wait_for_pipeline_to_finish(gitpkg, pipeline_id, dry_run=False):
"""
sleep_step = 30
- max_sleep = 60 * 60 # one hour
+ max_sleep = 120 * 60 # two hours
# pipeline = get_last_pipeline(gitpkg, before_last=before_last)
print('Waiting for the pipeline {0} of package {1} to finish. Do not interrupt.'.format(pipeline_id, gitpkg.name))
--
GitLab