Skip to content

Commit

Permalink
Add support for Ubuntu 24.04
Browse files Browse the repository at this point in the history
Signed-off-by: Norman Ziegner <n.ziegner@hzdr.de>
  • Loading branch information
Normo committed May 23, 2024
1 parent 4925480 commit 0224920
Show file tree
Hide file tree
Showing 18 changed files with 19 additions and 7 deletions.
1 change: 1 addition & 0 deletions .github/workflows/haproxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ jobs:
image:
- "ghcr.io/hifis-net/ubuntu-systemd:20.04"
- "ghcr.io/hifis-net/ubuntu-systemd:22.04"
- "ghcr.io/hifis-net/ubuntu-systemd:24.04"

steps:
- name: "Check out the codebase."
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/keepalived.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ jobs:
fail-fast: false
matrix:
image:
- "ghcr.io/hifis-net/ubuntu-systemd:24.04"
- "ghcr.io/hifis-net/ubuntu-systemd:22.04"
- "ghcr.io/hifis-net/ubuntu-systemd:20.04"

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/netplan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ jobs:
image:
- "ghcr.io/hifis-net/ubuntu-systemd:20.04"
- "ghcr.io/hifis-net/ubuntu-systemd:22.04"
- "ghcr.io/hifis-net/ubuntu-systemd:24.04"

steps:
- name: "Check out the codebase."
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/redis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ jobs:
image:
- "ghcr.io/hifis-net/ubuntu-systemd:20.04"
- "ghcr.io/hifis-net/ubuntu-systemd:22.04"
- "ghcr.io/hifis-net/ubuntu-systemd:24.04"

steps:
- name: "Check out the codebase."
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ssh_keys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ jobs:
- "ghcr.io/hifis-net/ubuntu-systemd:18.04"
- "ghcr.io/hifis-net/ubuntu-systemd:20.04"
- "ghcr.io/hifis-net/ubuntu-systemd:22.04"
- "ghcr.io/hifis-net/ubuntu-systemd:24.04"
- "ghcr.io/hifis-net/debian-systemd:10"
- "ghcr.io/hifis-net/debian-systemd:11"

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/unattended_upgrades.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ jobs:
fail-fast: false
matrix:
image:
- "ghcr.io/hifis-net/ubuntu-systemd:24.04"
- "ghcr.io/hifis-net/ubuntu-systemd:22.04"
- "ghcr.io/hifis-net/ubuntu-systemd:20.04"
- "ghcr.io/hifis-net/debian-systemd:12"
Expand Down
4 changes: 2 additions & 2 deletions molecule/haproxy/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ driver:
name: "podman"
platforms:
- name: "instancehaproxy1"
image: "${MOLECULE_IMAGE:-ghcr.io/hifis-net/ubuntu-systemd:22.04}"
image: "${MOLECULE_IMAGE:-ghcr.io/hifis-net/ubuntu-systemd:24.04}"
pre_build_image: true
privileged: true
override_command: false
systemd: true
tty: true
- name: "instancehaproxy2"
image: "${MOLECULE_IMAGE:-ghcr.io/hifis-net/ubuntu-systemd:22.04}"
image: "${MOLECULE_IMAGE:-ghcr.io/hifis-net/ubuntu-systemd:24.04}"
pre_build_image: true
privileged: true
override_command: false
Expand Down
2 changes: 1 addition & 1 deletion molecule/keepalived/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ driver:
name: "podman"
platforms:
- name: "instancekeepalived"
image: "${MOLECULE_IMAGE:-ghcr.io/hifis-net/ubuntu-systemd:22.04}"
image: "${MOLECULE_IMAGE:-ghcr.io/hifis-net/ubuntu-systemd:24.04}"
pre_build_image: true
privileged: true
systemd: "always"
Expand Down
2 changes: 1 addition & 1 deletion molecule/netplan/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ driver:
name: "podman"
platforms:
- name: "instancenetplan"
image: "${MOLECULE_IMAGE:-ghcr.io/hifis-net/ubuntu-systemd:22.04}"
image: "${MOLECULE_IMAGE:-ghcr.io/hifis-net/ubuntu-systemd:24.04}"
pre_build_image: true
override_command: false
privileged: true
Expand Down
2 changes: 1 addition & 1 deletion molecule/redis/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ driver:
name: "podman"
platforms:
- name: "instance_redis"
image: "${MOLECULE_IMAGE:-ghcr.io/hifis-net/ubuntu-systemd:22.04}"
image: "${MOLECULE_IMAGE:-ghcr.io/hifis-net/ubuntu-systemd:24.04}"
pre_build_image: true
privileged: true
systemd: "always"
Expand Down
2 changes: 1 addition & 1 deletion molecule/ssh_keys/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ driver:
name: "podman"
platforms:
- name: "instance"
image: "${MOLECULE_IMAGE:-ghcr.io/hifis-net/ubuntu-systemd:22.04}"
image: "${MOLECULE_IMAGE:-ghcr.io/hifis-net/ubuntu-systemd:24.04}"
pre_build_image: true
privileged: true
override_command: false
Expand Down
2 changes: 1 addition & 1 deletion molecule/unattended_upgrades/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ driver:
name: "podman"
platforms:
- name: "instance"
image: "${MOLECULE_IMAGE:-ghcr.io/hifis-net/ubuntu-systemd:22.04}"
image: "${MOLECULE_IMAGE:-ghcr.io/hifis-net/ubuntu-systemd:24.04}"
pre_build_image: true
privileged: true
override_command: false
Expand Down
1 change: 1 addition & 0 deletions roles/haproxy/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ galaxy_info:
versions:
- "focal"
- "jammy"
- "noble"

galaxy_tags:
- "haproxy"
Expand Down
1 change: 1 addition & 0 deletions roles/keepalived/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ galaxy_info:
versions:
- "focal"
- "jammy"
- "noble"

galaxy_tags:
- "keepalived"
Expand Down
1 change: 1 addition & 0 deletions roles/netplan/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ galaxy_info:
versions:
- "focal"
- "jammy"
- "noble"

galaxy_tags:
- "netplan"
Expand Down
1 change: 1 addition & 0 deletions roles/redis/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ galaxy_info:
versions:
- "focal"
- "jammy"
- "noble"

galaxy_tags:
- "redis"
Expand Down
1 change: 1 addition & 0 deletions roles/ssh_keys/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ galaxy_info:
- "bionic"
- "focal"
- "jammy"
- "noble"
- name: "Debian"
versions:
- "buster"
Expand Down
1 change: 1 addition & 0 deletions roles/unattended_upgrades/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ galaxy_info:
versions:
- "jammy"
- "focal"
- "noble"
- name: "Debian"
versions:
- "buster"
Expand Down

0 comments on commit 0224920

Please sign in to comment.