Skip to content

Commit 2a28bf2

Browse files
committed
feat: add support for ubuntu 24.04
Signed-off-by: Tom Krouper <[email protected]>
1 parent ceb2146 commit 2a28bf2

File tree

6 files changed

+88
-2
lines changed

6 files changed

+88
-2
lines changed

.github/workflows/ci.yml

+7
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030
- "ubuntu-1804"
3131
- "ubuntu-2004"
3232
- "ubuntu-2204"
33+
- "ubuntu-2404"
3334
suite:
3435
- "client-install-57"
3536
- "client-install-80"
@@ -68,6 +69,12 @@ jobs:
6869
suite: smoke57
6970
- os: ubuntu-2204
7071
suite: resources-57
72+
- os: ubuntu-2404
73+
suite: client-install-57
74+
- os: ubuntu-2404
75+
suite: smoke57
76+
- os: ubuntu-2404
77+
suite: resources-57
7178
- os: rockylinux-8
7279
suite: client-install-57
7380
- os: rockylinux-8

CHANGELOG.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
44

55
## Unreleased
66

7+
- feat: add support for ubuntu 24.04 (noble numbat)
8+
79
## 11.1.8 - *2024-11-18*
810

911
## 11.1.7 - *2024-11-18*
@@ -659,7 +661,7 @@ Adding Ubuntu 13.04 to Platforminfo
659661
- **[COOK-2966] - Address foodcritic failures'
660662
- **[COOK-4182] - Template parse failure in /etc/init/mysql.conf (data_dir)'
661663
- **[COOK-4198] - Added missing tunable'
662-
- **[COOK-4206] - create [email protected], as well as root@localhost'
664+
- **[COOK-4206] - create `[email protected]`, as well as `root@localhost`'
663665

664666
## [4.0.20] - 2014-01-18
665667

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ The following platforms have been tested with Test Kitchen:
3838
| ubuntu-18.04 | | X | |
3939
| ubuntu-20.04 | | | X |
4040
| ubuntu-22.04 | | | X |
41+
| ubuntu-24.04 | | | X |
4142

4243
## Cookbook Dependencies
4344

kitchen.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ suse_dists_with_56 = %w(opensuse-leap-15)
44
yum_dists_with_57 = %w(centos-7 fedora-latest)
55
apt_dists_with_57 = %w(ubuntu-18.04)
66
yum_dists_with_80 = %w(centos-7 centos-stream-8 almalinux-8 rockylinux-8 fedora-latest)
7-
apt_dists_with_80 = %w(ubuntu-20.04)
7+
apt_dists_with_80 = %w(ubuntu-20.04 ubuntu-22.04 ubuntu-24.04)
88
%>
99
---
1010
driver:
@@ -31,6 +31,8 @@ platforms:
3131
- name: rockylinux-8
3232
- name: ubuntu-18.04
3333
- name: ubuntu-20.04
34+
- name: ubuntu-22.04
35+
- name: ubuntu-24.04
3436

3537
suites:
3638
#

libraries/helpers.rb

+6
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ def jammy?
5252
false
5353
end
5454

55+
def noble?
56+
return true if platform?('ubuntu') && node['platform_version'] == '24.04'
57+
false
58+
end
59+
5560
def defaults_file
5661
"#{etc_dir}/my.cnf"
5762
end
@@ -85,6 +90,7 @@ def default_major_version
8590
return '5.7' if bionic?
8691
return '8.0' if focal?
8792
return '8.0' if jammy?
93+
return '8.0' if noble?
8894

8995
# misc
9096
return '5.6' if platform?('freebsd')
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# vim:syntax=apparmor
2+
# Last Modified: Tue Feb 09 15:28:30 2016
3+
#include <tunables/global>
4+
5+
/usr/sbin/mysqld {
6+
#include <abstractions/base>
7+
#include <abstractions/nameservice>
8+
#include <abstractions/user-tmp>
9+
#include <abstractions/mysql>
10+
#include <abstractions/winbind>
11+
12+
# Allow system resource access
13+
/sys/devices/system/cpu/ r,
14+
capability sys_resource,
15+
capability dac_override,
16+
capability setuid,
17+
capability setgid,
18+
19+
# Allow network access
20+
network tcp,
21+
22+
/etc/hosts.allow r,
23+
/etc/hosts.deny r,
24+
25+
# Allow config access
26+
/etc/mysql/** r,
27+
28+
# Allow pid, socket, socket lock file access
29+
/var/run/mysqld/mysqld.pid rw,
30+
/var/run/mysqld/mysqld.sock rw,
31+
/var/run/mysqld/mysqld.sock.lock rw,
32+
/run/mysqld/mysqld.pid rw,
33+
/run/mysqld/mysqld.sock rw,
34+
/run/mysqld/mysqld.sock.lock rw,
35+
36+
# Allow execution of server binary
37+
/usr/sbin/mysqld mr,
38+
/usr/sbin/mysqld-debug mr,
39+
40+
# Allow plugin access
41+
/usr/lib/mysql/plugin/ r,
42+
/usr/lib/mysql/plugin/*.so* mr,
43+
44+
# Allow error msg and charset access
45+
/usr/share/mysql/ r,
46+
/usr/share/mysql/** r,
47+
48+
# Allow data dir access
49+
/var/lib/mysql/ r,
50+
/var/lib/mysql/** rwk,
51+
52+
# Allow data files dir access
53+
/var/lib/mysql-files/ r,
54+
/var/lib/mysql-files/** rwk,
55+
56+
# Allow keyring dir access
57+
/var/lib/mysql-keyring/ r,
58+
/var/lib/mysql-keyring/** rwk,
59+
60+
# Allow log file access
61+
/var/log/mysql.err rw,
62+
/var/log/mysql.log rw,
63+
/var/log/mysql/ r,
64+
/var/log/mysql/** rw,
65+
66+
# Site-specific additions and overrides. See local/README for details.
67+
#include <local/usr.sbin.mysqld>
68+
}

0 commit comments

Comments
 (0)