From 3514b7bba490070bd1832b9f7839ad63c33f24c3 Mon Sep 17 00:00:00 2001 From: Tobias Huste Date: Wed, 24 Jul 2024 06:41:09 +0200 Subject: [PATCH] Add support for Ubuntu 24.04 in GitLab role --- .github/workflows/gitlab.yml | 1 + molecule/gitlab/molecule.yml | 2 +- roles/gitlab/meta/main.yml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gitlab.yml b/.github/workflows/gitlab.yml index dc0bdbc..51452d4 100644 --- a/.github/workflows/gitlab.yml +++ b/.github/workflows/gitlab.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" - "ghcr.io/hifis-net/debian-systemd:11" steps: diff --git a/molecule/gitlab/molecule.yml b/molecule/gitlab/molecule.yml index ca81ad8..6aab80f 100644 --- a/molecule/gitlab/molecule.yml +++ b/molecule/gitlab/molecule.yml @@ -10,7 +10,7 @@ driver: name: "podman" platforms: - name: "instancegitlab" - image: "${MOLECULE_IMAGE:-ghcr.io/hifis-net/ubuntu-systemd:20.04}" + image: "${MOLECULE_IMAGE:-ghcr.io/hifis-net/ubuntu-systemd:24.04}" pre_build_image: true privileged: true systemd: "always" diff --git a/roles/gitlab/meta/main.yml b/roles/gitlab/meta/main.yml index 0e46848..0e9dda5 100644 --- a/roles/gitlab/meta/main.yml +++ b/roles/gitlab/meta/main.yml @@ -22,6 +22,7 @@ galaxy_info: versions: - "focal" - "jammy" + - "noble" - name: "Debian" versions: - "bullseye"