From 43ac4198eb7a1ab193235020bd24205e3eed9b39 Mon Sep 17 00:00:00 2001
From: Mischa ter Smitten <mischa@tersmitten.nl>
Date: Fri, 8 Nov 2024 15:53:49 +0100
Subject: [PATCH] Add support for Noble

---
 .github/workflows/ci.yml         | 12 ++++++------
 Vagrantfile                      | 33 +++++++++++++++++++-------------
 meta/main.yml                    |  8 ++++----
 molecule/default/collections.yml |  6 +-----
 molecule/default/molecule.yml    |  2 +-
 5 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dc2fb0a..70e6297 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,14 +44,14 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - distro: debian9
           - distro: debian10
-          - distro: ubuntu1604
-            ansible-version: '>=2.10, <2.11'
-          - distro: ubuntu1604
+          - distro: debian11
+          - distro: debian12
           - distro: ubuntu1804
+            ansible-version: '>=9, <10'
           - distro: ubuntu2004
           - distro: ubuntu2204
+          - distro: ubuntu2404
 
     steps:
       - name: Check out the codebase
@@ -65,8 +65,8 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies
-        run: pip install 'ansible${{ matrix.ansible-version }}' molecule-plugins[docker] docker
-
+        run: |
+          pip install 'ansible${{ matrix.ansible-version }}' molecule-plugins[docker] docker
       - name: Run Molecule tests
         run: |
           molecule test
diff --git a/Vagrantfile b/Vagrantfile
index 528f7e8..e86d32d 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -4,13 +4,6 @@
 role = File.basename(File.expand_path(File.dirname(__FILE__)))
 
 boxes = [
-  {
-    :name => "ubuntu-1604",
-    :box => "bento/ubuntu-16.04",
-    :ip => '10.0.0.12',
-    :cpu => "50",
-    :ram => "256"
-  },
   {
     :name => "ubuntu-1804",
     :box => "bento/ubuntu-18.04",
@@ -23,21 +16,21 @@ boxes = [
     :box => "bento/ubuntu-20.04",
     :ip => '10.0.0.14',
     :cpu => "50",
-    :ram => "384"
+    :ram => "512"
   },
   {
     :name => "ubuntu-2204",
     :box => "bento/ubuntu-22.04",
     :ip => '10.0.0.15',
     :cpu => "50",
-    :ram => "384"
+    :ram => "512"
   },
   {
-    :name => "debian-9",
-    :box => "bento/debian-9",
-    :ip => '10.0.0.17',
+    :name => "ubuntu-2404",
+    :box => "bento/ubuntu-24.04",
+    :ip => '10.0.0.16',
     :cpu => "50",
-    :ram => "256"
+    :ram => "512"
   },
   {
     :name => "debian-10",
@@ -46,6 +39,20 @@ boxes = [
     :cpu => "50",
     :ram => "256"
   },
+  {
+    :name => "debian-11",
+    :box => "bento/debian-11",
+    :ip => '10.0.0.19',
+    :cpu => "50",
+    :ram => "256"
+  },
+  {
+    :name => "debian-12",
+    :box => "bento/debian-12",
+    :ip => '10.0.0.20',
+    :cpu => "50",
+    :ram => "384"
+  },
 ]
 
 Vagrant.configure("2") do |config|
diff --git a/meta/main.yml b/meta/main.yml
index afc37a9..a10edf2 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,9 +1,8 @@
 # meta file
 ---
 galaxy_info:
-  namespace: oefenweb
+  author: oefenweb
   role_name: rstudio_server
-  author: Mischa ter Smitten
   company: Oefenweb.nl B.V.
   description: Set up (the latest version of) RStudio server in Debian-like systems
   license: MIT
@@ -11,14 +10,15 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
-        - xenial
         - bionic
         - focal
         - jammy
+        - noble
     - name: Debian
       versions:
-        - stretch
         - buster
+        - bullseye
+        - bookworm
   galaxy_tags:
     - development
     - system
diff --git a/molecule/default/collections.yml b/molecule/default/collections.yml
index c3d7e2a..1062b36 100644
--- a/molecule/default/collections.yml
+++ b/molecule/default/collections.yml
@@ -1,6 +1,2 @@
 ---
-collections:
-  - name: community.docker
-    version: '>=1.2.0,<2'
-  - name: community.general
-    version: '>=2,<3'
+collections: []
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 8841165..908aaf6 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -5,7 +5,7 @@ driver:
   name: docker
 platforms:
   - name: instance
-    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu1604}-ansible:latest"
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest"
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw