Skip to content

Commit 09a348d

Browse files
TEST Ubuntu 24.04 support
1 parent 3cc1d4e commit 09a348d

File tree

2 files changed

+6
-58
lines changed

2 files changed

+6
-58
lines changed

metadata.json

Lines changed: 1 addition & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -14,66 +14,10 @@
1414
}
1515
],
1616
"operatingsystem_support": [
17-
{
18-
"operatingsystem": "RedHat",
19-
"operatingsystemrelease": [
20-
"7",
21-
"8",
22-
"9"
23-
]
24-
},
25-
{
26-
"operatingsystem": "CentOS",
27-
"operatingsystemrelease": [
28-
"7",
29-
"8"
30-
]
31-
},
32-
{
33-
"operatingsystem": "OracleLinux",
34-
"operatingsystemrelease": [
35-
"7"
36-
]
37-
},
38-
{
39-
"operatingsystem": "Debian",
40-
"operatingsystemrelease": [
41-
"10",
42-
"11",
43-
"12"
44-
]
45-
},
46-
{
47-
"operatingsystem": "Scientific",
48-
"operatingsystemrelease": [
49-
"7"
50-
]
51-
},
52-
{
53-
"operatingsystem": "SLES",
54-
"operatingsystemrelease": [
55-
"12",
56-
"15"
57-
]
58-
},
5917
{
6018
"operatingsystem": "Ubuntu",
6119
"operatingsystemrelease": [
62-
"18.04",
63-
"20.04",
64-
"22.04"
65-
]
66-
},
67-
{
68-
"operatingsystem": "Rocky",
69-
"operatingsystemrelease": [
70-
"8"
71-
]
72-
},
73-
{
74-
"operatingsystem": "AlmaLinux",
75-
"operatingsystemrelease": [
76-
"8"
20+
"24.04"
7721
]
7822
}
7923
],

spec/spec_helper_acceptance_local.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ def ubuntu_2204?
3232
os[:family] == 'ubuntu' && os[:release].to_f == 22.04
3333
end
3434

35+
def ubuntu_2404?
36+
os[:family] == 'ubuntu' && os[:release].to_f == 24.04
37+
end
38+
3539
def sles_15?
3640
os[:family] == 'sles' && os[:release].to_i == 15
3741
end
@@ -41,7 +45,7 @@ def debian_12?
4145
end
4246

4347
def charset
44-
@charset ||= (debian_12? || ubuntu_2204? || sles_15?) ? 'utf8mb3' : 'utf8'
48+
@charset ||= (ubuntu_2404? || debian_12? || ubuntu_2204? || sles_15?) ? 'utf8mb3' : 'utf8'
4549
end
4650

4751
def get_db_cmd

0 commit comments

Comments
 (0)