From b7fbe1a7abe275afedfcc2664322ddfaa1fa8e47 Mon Sep 17 00:00:00 2001 From: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Date: Tue, 12 Sep 2023 16:27:45 +0300 Subject: [PATCH] NAS-124014 / 24.04 / fix collabora update strategy (#1524) --- .../ix-dev/charts/collabora/upgrade_strategy | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/library/ix-dev/charts/collabora/upgrade_strategy b/library/ix-dev/charts/collabora/upgrade_strategy index 9e1885c4ee..1b8a39e9a7 100755 --- a/library/ix-dev/charts/collabora/upgrade_strategy +++ b/library/ix-dev/charts/collabora/upgrade_strategy @@ -3,16 +3,26 @@ import json import sys import re -from catalog_update.upgrade_strategy import semantic_versioning +from catalog_update.upgrade_strategy import datetime_versioning -RE_STABLE_VERSION = re.compile(r'^\d+\.\d+\.\d+\.\d+\.\d+$') +RE_STABLE_VERSION = re.compile(r'^(\d+\.){4}\d+$') def newer_mapping(image_tags): key = list(image_tags.keys())[0] - tags = {t: t for t in image_tags[key] if RE_STABLE_VERSION.fullmatch(t)} - version = semantic_versioning(list(tags)) + temp_tags = {t: t for t in image_tags[key] if RE_STABLE_VERSION.fullmatch(t)} + tags = {} + for tag in temp_tags: + tag = tag.split('.') + for i in range(len(tag)): + # Add leading zero to single digit numbers + if len(tag[i]) == 1: + tag[i] = '0' + tag[i] + tag = '.'.join(tag) + tags[tag] = tag + + version = datetime_versioning(list(tags), '%y.%m.%d.%H.%M') if not version: return {}