feat: add support for ubuntu 24.04

.github/workflows/ci.yml

@@ -30,6 +30,7 @@ jobs:
           - "ubuntu-1804"
           - "ubuntu-2004"
           - "ubuntu-2204"
+          - "ubuntu-2404"
         suite:
           - "client-install-57"
           - "client-install-80"
@@ -68,6 +69,12 @@ jobs:
             suite: smoke57
           - os: ubuntu-2204
             suite: resources-57
+          - os: ubuntu-2404
+            suite: client-install-57
+          - os: ubuntu-2404
+            suite: smoke57
+          - os: ubuntu-2404
+            suite: resources-57
           - os: rockylinux-8
             suite: client-install-57
           - os: rockylinux-8

CHANGELOG.md

@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+- feat: add support for ubuntu 24.04 (noble numbat)
+
 ## 11.1.9 - *2024-12-09*
 
 ## 11.1.8 - *2024-11-18*
@@ -661,7 +663,7 @@ Adding Ubuntu 13.04 to Platforminfo
 - **[COOK-2966] - Address foodcritic failures'
 - **[COOK-4182] - Template parse failure in /etc/init/mysql.conf (data_dir)'
 - **[COOK-4198] - Added missing tunable'
-- **[COOK-4206] - create [email protected], as well as root@localhost'
+- **[COOK-4206] - create `[email protected]`, as well as `root@localhost`'
 
 ## [4.0.20] - 2014-01-18
 

README.md

@@ -38,6 +38,7 @@ The following platforms have been tested with Test Kitchen:
 | ubuntu-18.04   |     |  X  |     |
 | ubuntu-20.04   |     |     |  X  |
 | ubuntu-22.04   |     |     |  X  |
+| ubuntu-24.04   |     |     |  X  |
 
 ## Cookbook Dependencies
 

kitchen.yml

@@ -4,7 +4,7 @@ suse_dists_with_56 = %w(opensuse-leap-15)
 yum_dists_with_57 = %w(centos-7 fedora-latest)
 apt_dists_with_57 = %w(ubuntu-18.04)
 yum_dists_with_80 = %w(centos-7 centos-stream-8 almalinux-8 rockylinux-8 fedora-latest)
-apt_dists_with_80 = %w(ubuntu-20.04)
+apt_dists_with_80 = %w(ubuntu-20.04 ubuntu-22.04 ubuntu-24.04)
 %>
 ---
 driver:
@@ -31,6 +31,8 @@ platforms:
   - name: rockylinux-8
   - name: ubuntu-18.04
   - name: ubuntu-20.04
+  - name: ubuntu-22.04
+  - name: ubuntu-24.04
 
 suites:
   #

libraries/helpers.rb

@@ -52,6 +52,11 @@ def jammy?
       false
     end
 
+    def noble?
+      return true if platform?('ubuntu') && node['platform_version'] == '24.04'
+      false
+    end
+
     def defaults_file
       "#{etc_dir}/my.cnf"
     end
@@ -85,6 +90,7 @@ def default_major_version
       return '5.7' if bionic?
       return '8.0' if focal?
       return '8.0' if jammy?
+      return '8.0' if noble?
 
       # misc
       return '5.6' if platform?('freebsd')

templates/default/apparmor/ubuntu-24.04/usr.sbin.mysqld.erb

@@ -0,0 +1,68 @@
+# vim:syntax=apparmor
+# Last Modified: Tue Feb 09 15:28:30 2016
+#include <tunables/global>
+
+/usr/sbin/mysqld {
+  #include <abstractions/base>
+  #include <abstractions/nameservice>
+  #include <abstractions/user-tmp>
+  #include <abstractions/mysql>
+  #include <abstractions/winbind>
+
+# Allow system resource access
+  /sys/devices/system/cpu/ r,
+  capability sys_resource,
+  capability dac_override,
+  capability setuid,
+  capability setgid,
+
+# Allow network access
+  network tcp,
+
+  /etc/hosts.allow r,
+  /etc/hosts.deny r,
+
+# Allow config access
+  /etc/mysql/** r,
+
+# Allow pid, socket, socket lock file access
+  /var/run/mysqld/mysqld.pid rw,
+  /var/run/mysqld/mysqld.sock rw,
+  /var/run/mysqld/mysqld.sock.lock rw,
+  /run/mysqld/mysqld.pid rw,
+  /run/mysqld/mysqld.sock rw,
+  /run/mysqld/mysqld.sock.lock rw,
+
+# Allow execution of server binary
+  /usr/sbin/mysqld mr,
+  /usr/sbin/mysqld-debug mr,
+
+# Allow plugin access
+  /usr/lib/mysql/plugin/ r,
+  /usr/lib/mysql/plugin/*.so* mr,
+
+# Allow error msg and charset access
+  /usr/share/mysql/ r,
+  /usr/share/mysql/** r,
+
+# Allow data dir access
+  /var/lib/mysql/ r,
+  /var/lib/mysql/** rwk,
+
+# Allow data files dir access
+  /var/lib/mysql-files/ r,
+  /var/lib/mysql-files/** rwk,
+
+# Allow keyring dir access
+  /var/lib/mysql-keyring/ r,
+  /var/lib/mysql-keyring/** rwk,
+
+# Allow log file access
+  /var/log/mysql.err rw,
+  /var/log/mysql.log rw,
+  /var/log/mysql/ r,
+  /var/log/mysql/** rw,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/usr.sbin.mysqld>
+}

test/cookbooks/test/recipes/smoke.rb

@@ -89,8 +89,10 @@
 # Create user repl on master
 bash 'create replication user' do
   code <<-EOF
-  /usr/bin/mysql -u root -h 127.0.0.1 -P 3306 -p#{Shellwords.escape(root_pass_master)} -D mysql -e "CREATE USER 'repl'@'127.0.0.1' IDENTIFIED BY 'REPLICAAATE';"
-  /usr/bin/mysql -u root -h 127.0.0.1 -P 3306 -p#{Shellwords.escape(root_pass_master)} -D mysql -e "GRANT REPLICATION SLAVE ON *.* TO 'repl'@'127.0.0.1';"
+  # MYSQL_PWD=#{Shellwords.escape(root_pass_master)} /usr/bin/mysql -u root -h 127.0.0.1 -P 3306 -D mysql -e "CREATE USER 'repl'@'127.0.0.1' IDENTIFIED BY 'REPLICAAATE';"
+  # MYSQL_PWD=#{Shellwords.escape(root_pass_master)} /usr/bin/mysql -u root -h 127.0.0.1 -P 3306 -D mysql -e "GRANT REPLICATION SLAVE ON *.* TO 'repl'@'127.0.0.1';"
+  MYSQL_PWD=ilikerandompasswords /usr/bin/mysql -u root -h 127.0.0.1 -P 3306 -D mysql -e "CREATE USER 'repl'@'127.0.0.1' IDENTIFIED BY 'REPLICAAATE';"
+  MYSQL_PWD=ilikerandompasswords /usr/bin/mysql -u root -h 127.0.0.1 -P 3306 -D mysql -e "GRANT REPLICATION SLAVE ON *.* TO 'repl'@'127.0.0.1';"
   EOF
   not_if "/usr/bin/mysql -u root -h 127.0.0.1 -P 3306 -p#{Shellwords.escape(root_pass_master)} -e 'select User,Host from mysql.user' | grep repl"
   action :run