Skip to content
Snippets Groups Projects
Commit b3b017e9 authored by Pavel KORSHUNOV's avatar Pavel KORSHUNOV
Browse files

ignore non-version tags, build wait time 2 hours

parent c0ea345d
No related branches found
No related tags found
No related merge requests found
...@@ -139,7 +139,8 @@ def get_latest_tag_name(gitpkg): ...@@ -139,7 +139,8 @@ def get_latest_tag_name(gitpkg):
if not latest_tags: if not latest_tags:
return None return None
# create list of tags' names but ignore the first 'v' character in each name # 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 # sort them correctly according to each subversion number
tag_names.sort(key=StrictVersion) tag_names.sort(key=StrictVersion)
# take the last one, as it is the latest tag in the sorted tags # 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): ...@@ -282,7 +283,7 @@ def wait_for_pipeline_to_finish(gitpkg, pipeline_id, dry_run=False):
""" """
sleep_step = 30 sleep_step = 30
max_sleep = 60 * 60 # one hour max_sleep = 120 * 60 # two hours
# pipeline = get_last_pipeline(gitpkg, before_last=before_last) # 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)) print('Waiting for the pipeline {0} of package {1} to finish. Do not interrupt.'.format(pipeline_id, gitpkg.name))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment