Skip to content

Commit

Permalink
roles: bump supported distributions (#423)
Browse files Browse the repository at this point in the history
This path updates the tested fedora and ubuntu versions to be in line
with current releases
  • Loading branch information
maxhoesel authored Jun 18, 2024
1 parent 397ea6b commit b5163de
Show file tree
Hide file tree
Showing 10 changed files with 110 additions and 42 deletions.
4 changes: 2 additions & 2 deletions roles/step_acme_cert/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ The advantage of the `step` method is that no additional tools are required.
## Requirements

- The following distributions are currently supported and tested:
- Ubuntu: `20.04 LTS, 22.04 LTS`
- Ubuntu: `20.04 LTS, 22.04 LTS, 24.04 LTS`
- Debian: `11, 12`
- Fedora: `38, 39`
- Fedora: `39, 40`
- RHEL(-compatible): `9` (RockyLinux is used for testing)
- Other distributions may work as well, but are not tested
- Running this role requires root access. Make sure to run this role with `become: yes` or equivalent
Expand Down
22 changes: 18 additions & 4 deletions roles/step_acme_cert/molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,20 @@ platforms:
networks:
- name: molecule-step-acme-cert

- name: step-host-ubuntu-24
groups:
- clients
- ubuntu
image: "docker.io/geerlingguy/docker-ubuntu2404-ansible"
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
cgroupns_mode: host
privileged: true
override_command: false
pre_build_image: true
networks:
- name: molecule-step-acme-cert

- name: step-host-ubuntu-22
groups:
- clients
Expand Down Expand Up @@ -83,11 +97,11 @@ platforms:
networks:
- name: molecule-step-acme-cert

- name: step-host-fedora-39
- name: step-host-fedora-40
groups:
- clients
- fedora
image: "docker.io/geerlingguy/docker-fedora39-ansible"
image: "docker.io/geerlingguy/docker-fedora40-ansible"
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
cgroupns_mode: host
Expand All @@ -97,11 +111,11 @@ platforms:
networks:
- name: molecule-step-acme-cert

- name: step-host-fedora-38
- name: step-host-fedora-39
groups:
- clients
- fedora
image: "docker.io/geerlingguy/docker-fedora38-ansible"
image: "docker.io/geerlingguy/docker-fedora39-ansible"
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
cgroupns_mode: host
Expand Down
22 changes: 18 additions & 4 deletions roles/step_acme_cert/molecule/non_root/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,20 @@ platforms:
networks:
- name: molecule-step-acme-cert

- name: step-host-ubuntu-24
groups:
- clients
- ubuntu
image: "docker.io/geerlingguy/docker-ubuntu2404-ansible"
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
cgroupns_mode: host
privileged: true
override_command: false
pre_build_image: true
networks:
- name: molecule-step-acme-cert

- name: step-host-ubuntu-22
groups:
- clients
Expand Down Expand Up @@ -83,11 +97,11 @@ platforms:
networks:
- name: molecule-step-acme-cert

- name: step-host-fedora-39
- name: step-host-fedora-40
groups:
- clients
- fedora
image: "docker.io/geerlingguy/docker-fedora39-ansible"
image: "docker.io/geerlingguy/docker-fedora40-ansible"
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
cgroupns_mode: host
Expand All @@ -97,11 +111,11 @@ platforms:
networks:
- name: molecule-step-acme-cert

- name: step-host-fedora-38
- name: step-host-fedora-39
groups:
- clients
- fedora
image: "docker.io/geerlingguy/docker-fedora38-ansible"
image: "docker.io/geerlingguy/docker-fedora39-ansible"
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
cgroupns_mode: host
Expand Down
4 changes: 2 additions & 2 deletions roles/step_bootstrap_host/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ It will:
## Requirements

- The following distributions are currently supported and tested:
- Ubuntu: `20.04 LTS, 22.04 LTS`
- Ubuntu: `20.04 LTS, 22.04 LTS, 24.04 LTS`
- Debian: `11, 12`
- Fedora: `38, 39`
- Fedora: `39, 40`
- RHEL(-compatible): `9` (RockyLinux is used for testing)
- Other distributions may work as well, but are not tested
- This role requires root access. Make sure to run this role with `become: yes` or equivalent
Expand Down
22 changes: 18 additions & 4 deletions roles/step_bootstrap_host/molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,20 @@ platforms:
networks:
- name: molecule-step-bootstrap-host

- name: step-host-ubuntu-24
groups:
- clients
- ubuntu
image: "docker.io/geerlingguy/docker-ubuntu2404-ansible"
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
cgroupns_mode: host
privileged: true
override_command: false
pre_build_image: true
networks:
- name: molecule-step-bootstrap-host

- name: step-host-ubuntu-22
groups:
- clients
Expand Down Expand Up @@ -84,11 +98,11 @@ platforms:
networks:
- name: molecule-step-bootstrap-host

- name: step-host-fedora-39
- name: step-host-fedora-40
groups:
- clients
- fedora
image: "docker.io/geerlingguy/docker-fedora39-ansible"
image: "docker.io/geerlingguy/docker-fedora40-ansible"
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
cgroupns_mode: host
Expand All @@ -98,11 +112,11 @@ platforms:
networks:
- name: molecule-step-bootstrap-host

- name: step-host-fedora-38
- name: step-host-fedora-39
groups:
- clients
- fedora
image: "docker.io/geerlingguy/docker-fedora38-ansible"
image: "docker.io/geerlingguy/docker-fedora39-ansible"
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
cgroupns_mode: host
Expand Down
22 changes: 18 additions & 4 deletions roles/step_bootstrap_host/molecule/multi_user/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,20 @@ platforms:
networks:
- name: molecule-step-bootstrap-host

- name: step-host-ubuntu-24
groups:
- clients
- ubuntu
image: "docker.io/geerlingguy/docker-ubuntu2404-ansible"
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
cgroupns_mode: host
privileged: true
override_command: false
pre_build_image: true
networks:
- name: molecule-step-bootstrap-host

- name: step-host-ubuntu-22
groups:
- clients
Expand Down Expand Up @@ -84,11 +98,11 @@ platforms:
networks:
- name: molecule-step-bootstrap-host

- name: step-host-fedora-39
- name: step-host-fedora-40
groups:
- clients
- fedora
image: "docker.io/geerlingguy/docker-fedora39-ansible"
image: "docker.io/geerlingguy/docker-fedora40-ansible"
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
cgroupns_mode: host
Expand All @@ -98,11 +112,11 @@ platforms:
networks:
- name: molecule-step-bootstrap-host

- name: step-host-fedora-38
- name: step-host-fedora-39
groups:
- clients
- fedora
image: "docker.io/geerlingguy/docker-fedora38-ansible"
image: "docker.io/geerlingguy/docker-fedora39-ansible"
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
cgroupns_mode: host
Expand Down
4 changes: 2 additions & 2 deletions roles/step_ca/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ It is thus **very** important that you **back up your root key and password** in
## Requirements

- The following distributions are currently supported and tested:
- Ubuntu: `20.04 LTS, 22.04 LTS`
- Ubuntu: `20.04 LTS, 22.04 LTS, 24.04 LTS`
- Debian: `11, 12`
- Fedora: `38, 39`
- Fedora: `39, 40`
- RHEL(-compatible): `9` (RockyLinux is used for testing)
- Other distributions may work as well, but are not tested
- Supported architectures: amd64, arm64
Expand Down
20 changes: 16 additions & 4 deletions roles/step_ca/molecule/default/molecule.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
platforms:
- name: step-ca-ubuntu-24
groups:
- ubuntu
- ca
image: "docker.io/geerlingguy/docker-ubuntu2404-ansible"
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
cgroupns_mode: host
privileged: true
override_command: false
pre_build_image: true

- name: step-ca-ubuntu-22
groups:
- ubuntu
Expand Down Expand Up @@ -59,23 +71,23 @@ platforms:
override_command: false
pre_build_image: true

- name: step-ca-fedora-39
- name: step-ca-fedora-40
groups:
- fedora
- ca
image: "docker.io/geerlingguy/docker-fedora39-ansible"
image: "docker.io/geerlingguy/docker-fedora40-ansible"
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
cgroupns_mode: host
privileged: true
override_command: false
pre_build_image: true

- name: step-ca-fedora-38
- name: step-ca-fedora-39
groups:
- fedora
- ca
image: "docker.io/geerlingguy/docker-fedora38-ansible"
image: "docker.io/geerlingguy/docker-fedora39-ansible"
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
cgroupns_mode: host
Expand Down
4 changes: 2 additions & 2 deletions roles/step_cli/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ This role is used by `step_bootstrap_host` and `step_ca`, but can also be used s
## Requirements

- The following distributions are currently supported and tested:
- Ubuntu: `20.04 LTS, 22.04 LTS`
- Ubuntu: `20.04 LTS, 22.04 LTS, 24.04 LTS`
- Debian: `11, 12`
- Fedora: `38, 39`
- Fedora: `39, 40`
- RHEL(-compatible): `9` (RockyLinux is used for testing)
- Other distributions may work as well, but are not tested
- Supported architectures: amd64, arm64
Expand Down
28 changes: 14 additions & 14 deletions roles/step_cli/molecule/default/molecule.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
platforms:
- name: step-cli-ubuntu-24
image: "docker.io/geerlingguy/docker-ubuntu2404-ansible"
groups:
- ubuntu
override_command: false
pre_build_image: true
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
cgroupns_mode: host
privileged: true

- name: step-cli-ubuntu-22
image: "docker.io/geerlingguy/docker-ubuntu2204-ansible"
groups:
Expand Down Expand Up @@ -54,10 +65,10 @@ platforms:
cgroupns_mode: host
privileged: true

- name: step-cli-rockylinux-8
image: "docker.io/geerlingguy/docker-rockylinux8-ansible"
- name: step-cli-fedora-40
image: "docker.io/geerlingguy/docker-fedora40-ansible"
groups:
- rockylinux
- fedora
override_command: false
pre_build_image: true
volumes:
Expand All @@ -76,17 +87,6 @@ platforms:
cgroupns_mode: host
privileged: true

- name: step-cli-fedora-38
image: "docker.io/geerlingguy/docker-fedora38-ansible"
groups:
- fedora
override_command: false
pre_build_image: true
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
cgroupns_mode: host
privileged: true

provisioner:
inventory:
group_vars:
Expand Down

0 comments on commit b5163de

Please sign in to comment.