From b6655d005694c93e27273ef27706895d9a745c68 Mon Sep 17 00:00:00 2001 From: Norman Ziegner Date: Thu, 23 May 2024 14:50:11 +0200 Subject: [PATCH] Add support for Ubuntu 24.04 Signed-off-by: Norman Ziegner --- .github/workflows/haproxy.yml | 1 + .github/workflows/keepalived.yml | 1 + .github/workflows/netplan.yml | 1 + .github/workflows/redis.yml | 1 + .github/workflows/ssh_keys.yml | 1 + .github/workflows/unattended_upgrades.yml | 1 + .github/workflows/zammad.yml | 1 + molecule/haproxy/molecule.yml | 4 ++-- molecule/keepalived/molecule.yml | 2 +- molecule/netplan/molecule.yml | 2 +- molecule/redis/molecule.yml | 2 +- molecule/ssh_keys/molecule.yml | 2 +- molecule/unattended_upgrades/molecule.yml | 2 +- molecule/zammad/molecule.yml | 2 +- roles/haproxy/meta/main.yml | 1 + roles/keepalived/meta/main.yml | 1 + roles/netplan/meta/main.yml | 1 + roles/redis/meta/main.yml | 1 + roles/ssh_keys/meta/main.yml | 1 + roles/unattended_upgrades/meta/main.yml | 1 + roles/zammad/meta/main.yml | 1 + 21 files changed, 22 insertions(+), 8 deletions(-) diff --git a/.github/workflows/haproxy.yml b/.github/workflows/haproxy.yml index 1ee0468..9777309 100644 --- a/.github/workflows/haproxy.yml +++ b/.github/workflows/haproxy.yml @@ -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." diff --git a/.github/workflows/keepalived.yml b/.github/workflows/keepalived.yml index 5bfe989..ce0aa59 100644 --- a/.github/workflows/keepalived.yml +++ b/.github/workflows/keepalived.yml @@ -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" diff --git a/.github/workflows/netplan.yml b/.github/workflows/netplan.yml index 27581c7..017e55e 100644 --- a/.github/workflows/netplan.yml +++ b/.github/workflows/netplan.yml @@ -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." diff --git a/.github/workflows/redis.yml b/.github/workflows/redis.yml index 5fe8a70..23d1d14 100644 --- a/.github/workflows/redis.yml +++ b/.github/workflows/redis.yml @@ -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." diff --git a/.github/workflows/ssh_keys.yml b/.github/workflows/ssh_keys.yml index e66de42..50ba50a 100644 --- a/.github/workflows/ssh_keys.yml +++ b/.github/workflows/ssh_keys.yml @@ -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" diff --git a/.github/workflows/unattended_upgrades.yml b/.github/workflows/unattended_upgrades.yml index aaf43b4..e873700 100644 --- a/.github/workflows/unattended_upgrades.yml +++ b/.github/workflows/unattended_upgrades.yml @@ -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" diff --git a/.github/workflows/zammad.yml b/.github/workflows/zammad.yml index 7afa6b9..707d6be 100644 --- a/.github/workflows/zammad.yml +++ b/.github/workflows/zammad.yml @@ -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" diff --git a/molecule/haproxy/molecule.yml b/molecule/haproxy/molecule.yml index 7b2c55d..b562084 100644 --- a/molecule/haproxy/molecule.yml +++ b/molecule/haproxy/molecule.yml @@ -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 diff --git a/molecule/keepalived/molecule.yml b/molecule/keepalived/molecule.yml index b824e75..afd0dd6 100644 --- a/molecule/keepalived/molecule.yml +++ b/molecule/keepalived/molecule.yml @@ -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" diff --git a/molecule/netplan/molecule.yml b/molecule/netplan/molecule.yml index f2bb8d3..ebab0dc 100644 --- a/molecule/netplan/molecule.yml +++ b/molecule/netplan/molecule.yml @@ -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 diff --git a/molecule/redis/molecule.yml b/molecule/redis/molecule.yml index 2d372f5..e96487d 100644 --- a/molecule/redis/molecule.yml +++ b/molecule/redis/molecule.yml @@ -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" diff --git a/molecule/ssh_keys/molecule.yml b/molecule/ssh_keys/molecule.yml index 6ba5efd..544b0dd 100644 --- a/molecule/ssh_keys/molecule.yml +++ b/molecule/ssh_keys/molecule.yml @@ -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 diff --git a/molecule/unattended_upgrades/molecule.yml b/molecule/unattended_upgrades/molecule.yml index ce12bce..6178ed6 100644 --- a/molecule/unattended_upgrades/molecule.yml +++ b/molecule/unattended_upgrades/molecule.yml @@ -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 diff --git a/molecule/zammad/molecule.yml b/molecule/zammad/molecule.yml index db72888..4fa5462 100644 --- a/molecule/zammad/molecule.yml +++ b/molecule/zammad/molecule.yml @@ -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 diff --git a/roles/haproxy/meta/main.yml b/roles/haproxy/meta/main.yml index 5903b82..ca9b315 100644 --- a/roles/haproxy/meta/main.yml +++ b/roles/haproxy/meta/main.yml @@ -21,6 +21,7 @@ galaxy_info: versions: - "focal" - "jammy" + - "noble" galaxy_tags: - "haproxy" diff --git a/roles/keepalived/meta/main.yml b/roles/keepalived/meta/main.yml index cce39f1..9e9d1c3 100644 --- a/roles/keepalived/meta/main.yml +++ b/roles/keepalived/meta/main.yml @@ -22,6 +22,7 @@ galaxy_info: versions: - "focal" - "jammy" + - "noble" galaxy_tags: - "keepalived" diff --git a/roles/netplan/meta/main.yml b/roles/netplan/meta/main.yml index b8f6357..70c8752 100644 --- a/roles/netplan/meta/main.yml +++ b/roles/netplan/meta/main.yml @@ -21,6 +21,7 @@ galaxy_info: versions: - "focal" - "jammy" + - "noble" galaxy_tags: - "netplan" diff --git a/roles/redis/meta/main.yml b/roles/redis/meta/main.yml index 410bade..86d8aca 100644 --- a/roles/redis/meta/main.yml +++ b/roles/redis/meta/main.yml @@ -21,6 +21,7 @@ galaxy_info: versions: - "focal" - "jammy" + - "noble" galaxy_tags: - "redis" diff --git a/roles/ssh_keys/meta/main.yml b/roles/ssh_keys/meta/main.yml index 9cdc6a7..3a15ba8 100644 --- a/roles/ssh_keys/meta/main.yml +++ b/roles/ssh_keys/meta/main.yml @@ -26,6 +26,7 @@ galaxy_info: - "bionic" - "focal" - "jammy" + - "noble" - name: "Debian" versions: - "buster" diff --git a/roles/unattended_upgrades/meta/main.yml b/roles/unattended_upgrades/meta/main.yml index fd23d8b..4e3cf97 100644 --- a/roles/unattended_upgrades/meta/main.yml +++ b/roles/unattended_upgrades/meta/main.yml @@ -16,6 +16,7 @@ galaxy_info: versions: - "jammy" - "focal" + - "noble" - name: "Debian" versions: - "buster" diff --git a/roles/zammad/meta/main.yml b/roles/zammad/meta/main.yml index 1ed5233..1baef52 100644 --- a/roles/zammad/meta/main.yml +++ b/roles/zammad/meta/main.yml @@ -19,6 +19,7 @@ galaxy_info: versions: - "focal" - "jammy" + - "noble" galaxy_tags: - "zammad"