Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Update platforms #710

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
1 change: 1 addition & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
use chefworkstation
export KITCHEN_GLOBAL_YAML=kitchen.global.yml
48 changes: 3 additions & 45 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,57 +23,15 @@ jobs:
strategy:
matrix:
os:
- "almalinux-8"
- "centos-7"
- "centos-stream-8"
- "rockylinux-8"
- "ubuntu-1804"
- "almalinux-9"
- "centos-stream-9"
- "rockylinux-9"
- "ubuntu-2004"
- "ubuntu-2204"
suite:
- "client-install-57"
- "client-install-80"
- "smoke57"
- "smoke80"
- "resources-57"
- "resources-80"
exclude:
- os: almalinux-8
suite: client-install-57
- os: almalinux-8
suite: smoke57
- os: almalinux-8
suite: resources-57
- os: centos-stream-8
suite: client-install-57
- os: centos-stream-8
suite: smoke57
- os: centos-stream-8
suite: resources-57
- os: ubuntu-1804
suite: client-install-80
- os: ubuntu-1804
suite: smoke80
- os: ubuntu-1804
suite: resources-80
- os: ubuntu-2004
suite: client-install-57
- os: ubuntu-2004
suite: smoke57
- os: ubuntu-2004
suite: resources-57
- os: ubuntu-2204
suite: client-install-57
- os: ubuntu-2204
suite: smoke57
- os: ubuntu-2204
suite: resources-57
- os: rockylinux-8
suite: client-install-57
- os: rockylinux-8
suite: smoke57
- os: rockylinux-8
suite: resources-57
fail-fast: false

steps:
Expand Down
16 changes: 0 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,6 @@ This cookbook is maintained by the Sous Chefs. The Sous Chefs are a community of
- Network accessible package repositories
- 'recipe[selinux::disabled]' on RHEL platforms

## Platform Support

The following platforms have been tested with Test Kitchen:

| OS | 5.6 | 5.7 | 8.0 |
|----------------|-----|-----|-----|
| centos-7 | X | X | X |
| centos-8 | | X | X |
| debian-9 | | X | |
| debian-10 | | | X |
| fedora | X | X | X |
| openSUSE Leap | X | | |
| ubuntu-18.04 | | X | |
| ubuntu-20.04 | | | X |
| ubuntu-22.04 | | | X |

## Cookbook Dependencies

There are no hard coupled dependencies. However, there is a loose dependency on `yum-mysql-community` for RHEL/CentOS platforms. As of the 8.0 version of this cookbook, configuration of the package repos is now the responsibility of the user.
Expand Down
29 changes: 2 additions & 27 deletions kitchen.dokken.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@ platforms:
image: dokken/amazonlinux-2023
pid_one_command: /usr/lib/systemd/systemd

- name: centos-7
driver:
image: dokken/centos-7
pid_one_command: /usr/lib/systemd/systemd

- name: centos-stream-8
driver:
image: dokken/centos-stream-8
Expand All @@ -37,16 +32,6 @@ platforms:
image: dokken/centos-stream-9
pid_one_command: /usr/lib/systemd/systemd

- name: debian-9
driver:
image: dokken/debian-9
pid_one_command: /bin/systemd

- name: debian-10
driver:
image: dokken/debian-10
pid_one_command: /bin/systemd

- name: debian-11
driver:
image: dokken/debian-11
Expand All @@ -67,11 +52,6 @@ platforms:
image: dokken/opensuse-leap-15
pid_one_command: /usr/lib/systemd/systemd

- name: oraclelinux-7
driver:
image: dokken/oraclelinux-7
pid_one_command: /usr/lib/systemd/systemd

- name: oraclelinux-8
driver:
image: dokken/oraclelinux-8
Expand All @@ -92,11 +72,6 @@ platforms:
image: dokken/rockylinux-9
pid_one_command: /usr/lib/systemd/systemd

- name: ubuntu-18.04
driver:
image: dokken/ubuntu-18.04
pid_one_command: /bin/systemd

- name: ubuntu-20.04
driver:
image: dokken/ubuntu-20.04
Expand All @@ -107,7 +82,7 @@ platforms:
image: dokken/ubuntu-22.04
pid_one_command: /bin/systemd

- name: ubuntu-23.04
- name: ubuntu-24.04
driver:
image: dokken/ubuntu-23.04
image: dokken/ubuntu-24.04
pid_one_command: /bin/systemd
6 changes: 1 addition & 5 deletions kitchen.global.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,17 @@ platforms:
- name: almalinux-8
- name: almalinux-9
- name: amazonlinux-2023
- name: centos-7
- name: centos-stream-8
- name: centos-stream-9
- name: debian-9
- name: debian-10
- name: debian-11
- name: debian-12
- name: fedora-latest
- name: opensuse-leap-15
- name: oraclelinux-7
- name: oraclelinux-8
- name: oraclelinux-9
- name: rockylinux-8
- name: rockylinux-9
- name: ubuntu-18.04
- name: ubuntu-20.04
- name: ubuntu-22.04
- name: ubuntu-23.04
- name: ubuntu-24.04
139 changes: 2 additions & 137 deletions kitchen.yml
Original file line number Diff line number Diff line change
@@ -1,82 +1,20 @@
<%
yum_dists_with_56 = %w(centos-7 amazon-linux-2)
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)
yum_dists_with_80 = %w(centos-stream-9 almalinux-9 rockylinux-9 fedora-latest)
apt_dists_with_80 = %w(ubuntu-20.04 ubuntu-22.04 ubuntu-24.04)
%>
---
driver:
name: vagrant
customize:
memory: 1024

provisioner:
name: chef_zero
deprecations_as_errors: true

verifier:
name: inspec

platforms:
- name: almalinux-8
- name: amazonlinux-2
- name: centos-7
- name: centos-stream-8
- name: debian-10
- name: debian-11
- name: fedora-latest
- name: opensuse-leap-15
- name: rockylinux-8
- name: ubuntu-18.04
- name: ubuntu-20.04

suites:
#
# client
#
- name: yum-client-install-56
run_list:
- recipe[selinux::disabled]
- recipe[test::yum_repo]
- recipe[test::installation_client]
attributes:
mysql_test:
version: '5.6'
includes: <%= yum_dists_with_56 %>

- name: suse-client-install-56
run_list:
- recipe[test::yum_repo]
- recipe[test::installation_client]
attributes:
mysql_test:
version: '5.6'
includes: <%= suse_dists_with_56 %>

- name: client-install-57
run_list:
- recipe[test::installation_client]
attributes:
mysql_test:
version: '5.7'
includes: <%= apt_dists_with_57 %>

- name: yum-client-install-57
run_list:
- recipe[selinux::disabled]
- recipe[test::yum_repo]
- recipe[test::installation_client]
attributes:
mysql_test:
version: '5.7'
includes: <%= yum_dists_with_57 %>

- name: yum-client-install-80
run_list:
- recipe[test::yum_repo]
- recipe[selinux::disabled]
- recipe[test::installation_client]
attributes:
mysql_test:
Expand All @@ -94,46 +32,6 @@ suites:
#
# server smoke
#
- name: yum-smoke56
run_list:
- recipe[selinux::disabled]
- recipe[test::yum_repo]
- recipe[test::smoke]
attributes:
mysql_test:
version: '5.6'
includes: <%= yum_dists_with_56 %>
verifier:
inspec_tests:
- path: test/integration/smoke56

- name: smoke57
run_list:
- recipe[test::smoke]
attributes:
mysql_test:
version: '5.7'
includes: <%= apt_dists_with_57 %>

- name: suse-smoke56
run_list:
- recipe[test::yum_repo]
- recipe[test::smoke]
attributes:
mysql_test:
version: '5.6'
includes: <%= suse_dists_with_56 %>

- name: yum-smoke57
run_list:
- recipe[selinux::disabled]
- recipe[test::yum_repo]
- recipe[test::smoke]
attributes:
mysql_test:
version: '5.7'
includes: <%= yum_dists_with_57 %>

- name: smoke80
run_list:
- recipe[test::smoke]
Expand All @@ -145,7 +43,6 @@ suites:
- name: yum-smoke80
run_list:
- recipe[test::yum_repo]
- recipe[selinux::disabled]
- recipe[test::smoke]
attributes:
mysql_test:
Expand All @@ -158,38 +55,6 @@ suites:
#
# resource tests
#
- name: resources-56
run_list:
- recipe[test::user_database]
attributes:
mysql_test:
version: '5.6'
includes: <%= yum_dists_with_56 %>
verifier:
controls:
- mysql_database
- mysql_user
inputs:
version: '5.6'
inspec_tests:
- path: test/integration/resources

- name: resources-57
run_list:
- recipe[test::user_database]
attributes:
mysql_test:
version: '5.7'
verifier:
controls:
- mysql_database
- mysql_user
inputs:
version: '5.8'
inspec_tests:
- path: test/integration/resources
includes: <%= yum_dists_with_57 + apt_dists_with_57 %>

- name: resources-80
run_list:
- recipe[test::user_database]
Expand Down
Loading
Loading