Skip to content

Commit 6b55e29

Browse files
authored
Merge pull request #869 from Raghavisatish/ubuntu25
Adding changes to support ubuntu25.04 image deployment
2 parents 6c7bb98 + 741d58e commit 6b55e29

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

zvmsdk/dist.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1495,6 +1495,10 @@ class ubuntu24(ubuntu20):
14951495
pass
14961496

14971497

1498+
class ubuntu25(ubuntu20):
1499+
pass
1500+
1501+
14981502
class LinuxDistManager(object):
14991503
def get_linux_dist(self, os_version):
15001504
distro, release = self.parse_dist(os_version)
@@ -1503,7 +1507,7 @@ def get_linux_dist(self, os_version):
15031507
def _parse_release(self, os_version, distro, remain):
15041508
supported = {'rhel': ['6', '7', '8', '9'],
15051509
'sles': ['11', '12', '15'],
1506-
'ubuntu': ['16', '20', '22', '24'],
1510+
'ubuntu': ['16', '20', '22', '24', '25'],
15071511
'rhcos': ['4']}
15081512
releases = supported[distro]
15091513

zvmsdk/sdkwsgi/validation/parameter_types.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ def valid_char(char):
471471
'^((s|S)(u|U)(s|S)(e|E))(11|12|15){1}(([.]|((s|S)(p|P)))[0-9])?$'},
472472
{'type': 'string',
473473
'pattern':
474-
'^((u|U)(b|B)(u|U)(n|N)(t|T)(u|U))(16|20|22|24){1}([.][0-9]{2})?([.][0-9])?$'},
474+
'^((u|U)(b|B)(u|U)(n|N)(t|T)(u|U))(16|20|22|24|25){1}([.][0-9]{2})?([.][0-9])?$'},
475475
{'type': 'string',
476476
'pattern':
477477
'^((r|R)(h|H)(c|C)(o|O)(s|S))(4){1}([.][0-9]{1,2})?([.][0-9]{1,2})?$'}

0 commit comments

Comments
 (0)