From 973c8c3bc9e66afc9728a5ad7dd935228e95d973 Mon Sep 17 00:00:00 2001 From: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Date: Fri, 23 Jun 2023 15:30:48 +0300 Subject: [PATCH] fix jenkins upgrade strategy (#1286) --- library/ix-dev/community/jenkins/Chart.yaml | 2 +- library/ix-dev/community/jenkins/upgrade_strategy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library/ix-dev/community/jenkins/Chart.yaml b/library/ix-dev/community/jenkins/Chart.yaml index 7da2818af5..295a3b6119 100644 --- a/library/ix-dev/community/jenkins/Chart.yaml +++ b/library/ix-dev/community/jenkins/Chart.yaml @@ -3,7 +3,7 @@ description: Jenkins is a leading open source automation server, annotations: title: Jenkins type: application -version: 1.0.0 +version: 1.0.1 apiVersion: v2 appVersion: '2.401.1' kubeVersion: '>=1.16.0-0' diff --git a/library/ix-dev/community/jenkins/upgrade_strategy b/library/ix-dev/community/jenkins/upgrade_strategy index 52d32d78f8..efb907878a 100755 --- a/library/ix-dev/community/jenkins/upgrade_strategy +++ b/library/ix-dev/community/jenkins/upgrade_strategy @@ -11,7 +11,7 @@ RE_STABLE_VERSION = re.compile(r'[0-9]+\.[0-9]+\.[0-9]+-jdk17') def newer_mapping(image_tags): key = list(image_tags.keys())[0] - tags = {t.strip('-jdk17'): t for t in image_tags[key] if RE_STABLE_VERSION.fullmatch(t)} + tags = {t.replace('-jdk17', ''): t for t in image_tags[key] if RE_STABLE_VERSION.fullmatch(t)} version = semantic_versioning(list(tags)) if not version: return {}