Skip to content

Commit 4a9f640

Browse files
committed
Fix find oldest supported version script
Major and minor numbers from versions were compared as strings, but they should be compared as integers.
1 parent 8f7eba0 commit 4a9f640

1 file changed

Lines changed: 9 additions & 3 deletions

File tree

.buildkite/scripts/find_oldest_supported_version.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ def find_oldest_supported_version(kibana_version_condition: str) -> str:
6767
if len(available_parts) < 2:
6868
continue
6969

70-
available_major = available_parts[0]
71-
available_minor = available_parts[1]
72-
if major == available_major and minor > available_minor:
70+
available_major = int(available_parts[0])
71+
available_minor = int(available_parts[1])
72+
if int(major) == available_major and int(minor)>available_minor:
7373
older = False
7474
break
7575
if older:
@@ -181,6 +181,7 @@ class TestFindOldestSupportVersion(unittest.TestCase):
181181
"8.11.0-SNAPSHOT"
182182
],
183183
"aliases": [
184+
"7.x-SNAPSHOT",
184185
"7.17-SNAPSHOT",
185186
"7.17",
186187
"8.7",
@@ -225,6 +226,11 @@ def test_available_version_contains_kibana_version(self):
225226
def test_too_old_to_be_in_api(self):
226227
self.assertEqual(find_oldest_supported_version("7.16.0"), "7.16.0")
227228
self.assertEqual(find_oldest_supported_version("8.6.0"), "8.6.0")
229+
self.assertEqual(find_oldest_supported_version("7.6.0"), "7.6.0")
230+
231+
def test_no_version_available_no_next_minor_in_current_major(self):
232+
# returns the version as in the manifest
233+
self.assertEqual(find_oldest_supported_version("8.11.3"), "8.11.3")
228234

229235
def test_or(self):
230236
self.assertEqual(find_oldest_supported_version("8.6.0||8.7.0"), "8.6.0")

0 commit comments

Comments
 (0)