Skip to content

Commit

Permalink
Remove Ubuntu 18 support, add Debian 12 (#152)
Browse files Browse the repository at this point in the history
roles: bump distro versions, explicitly state releases
  • Loading branch information
maxhoesel authored Sep 29, 2023
1 parent 0df4e23 commit ed197ec
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

### Dependencies

- A recent version of ansible. We test against the current and the previous major releases
- A recent version of ansible. We test against the current and the 2 previous major releases
- Python 3.6 or newer on remote hosts and the controller

### Install via ansible-galaxy
Expand Down
4 changes: 2 additions & 2 deletions roles/borg_server/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ The server uses these keys to restrict hosts into a single directory where they
## Requirements

- The following distributions are currently supported:
- Ubuntu 18.04 LTS or newer
- Debian 10 or newer
- Ubuntu: 20.04 LTS, 22.04 LTS
- Debian: 10, 11, 12
- There are no plans to support CentOS/RHEL-based distros right now
- This role requires root access. Make sure to run this role with `become: yes` or equivalent

Expand Down
6 changes: 3 additions & 3 deletions roles/borg_server/molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ platforms:
pre_build_image: true
systemd: always

- name: borg-server-ubuntu-18
- name: borg-server-debian-12
groups:
- ubuntu
image: "docker.io/geerlingguy/docker-ubuntu1804-ansible"
- debian
image: "docker.io/geerlingguy/docker-debian12-ansible"
override_command: false
pre_build_image: true
systemd: always
Expand Down
4 changes: 2 additions & 2 deletions roles/borgmatic/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ then optionally sets up a scheduled backup job. More specifically, this role wil
## Requirements

- The following distributions are currently supported:
- Ubuntu 20.04 LTS or newer
- Debian 11 or newer
- Ubuntu: 20.04 LTS, 22.04 LTS
- Debian: 11, 12
- There are no plans to support CentOS/RHEL-based distros right now
- This role requires root access. Make sure to run this role with `become: yes` or equivalent
- Supported Borgmatic versions: 1.5 and up
Expand Down
8 changes: 8 additions & 0 deletions roles/borgmatic/molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@ platforms:
pre_build_image: true
systemd: always

- name: borgmatic-debian-12
groups:
- debian
image: "docker.io/geerlingguy/docker-debian12-ansible"
override_command: false
pre_build_image: true
systemd: always

- name: borgmatic-debian-11
groups:
- debian
Expand Down
10 changes: 10 additions & 0 deletions roles/borgmatic/molecule/remote-repo/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,16 @@ platforms:
systemd: always
network: molecule-borgmatic

- name: borgmatic-debian-12
groups:
- debian
- clients
image: "docker.io/geerlingguy/docker-debian12-ansible"
override_command: false
pre_build_image: true
systemd: always
network: molecule-borgmatic

- name: borgmatic-debian-11
groups:
- debian
Expand Down

0 comments on commit ed197ec

Please sign in to comment.