Merge pull request #17 from Oefenweb/add-support-for-noble

Add support for Noble
Oefenweb · Nov 8, 2024 · 38e48f9 · 38e48f9
2 parents b577d86 + ca21473
commit 38e48f9
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 45 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -44,14 +44,11 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - distro: debian9
-          - distro: debian10
-          - distro: ubuntu1604
-            ansible-version: '>=2.10, <2.11'
-          - distro: ubuntu1604
-          - distro: ubuntu1804
+          - distro: debian11
+          - distro: debian12
           - distro: ubuntu2004
           - distro: ubuntu2204
+          - distro: ubuntu2404
 
     steps:
       - name: Check out the codebase
@@ -65,8 +62,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/README.md b/README.md
@@ -12,7 +12,7 @@ Set up (the latest version of) [RStudio Server](https://www.rstudio.com/products
 
 #### Variables
 
-* `rstudio_server_version` [default: `2023.03.1-446`]: Version to install
+* `rstudio_server_version` [default: `2024.09.1-394`]: Version to install
 * `rstudio_server_install` [default: `[]`]: Additional packages to install (e.g. `r-base`)
 
 * `rstudio_server_www_port` [default: `8787`]: The port you want RStudio to listen on

diff --git a/Vagrantfile b/Vagrantfile
@@ -4,48 +4,41 @@
 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",
-    :ip => '10.0.0.13',
-    :cpu => "50",
-    :ram => "384"
-  },
   {
     :name => "ubuntu-2004",
     :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",
-    :box => "bento/debian-10",
-    :ip => '10.0.0.18',
+    :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/defaults/main.yml b/defaults/main.yml
@@ -1,6 +1,6 @@
 # defaults file
 ---
-rstudio_server_version: '2023.03.1-446'
+rstudio_server_version: '2024.09.1-394'
 rstudio_server_install: []
 
 rstudio_server_www_port: 8787

diff --git a/meta/main.yml b/meta/main.yml
@@ -1,24 +1,22 @@
 # 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
   min_ansible_version: 2.10.0
   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
@@ -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
@@ -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

diff --git a/vars/_bookworm.yml b/vars/_bookworm.yml
@@ -0,0 +1,3 @@
+# vars file
+---
+rstudio_server_download_url: "https://download2.rstudio.org/server/jammy/{{ rstudio_server_machine_map[ansible_machine] }}/rstudio-server-{{ rstudio_server_version }}-{{ rstudio_server_machine_map[ansible_machine] }}.deb"
diff --git a/vars/_bullseye.yml b/vars/_bullseye.yml
@@ -0,0 +1,3 @@
+# vars file
+---
+rstudio_server_download_url: "https://download2.rstudio.org/server/focal/{{ rstudio_server_machine_map[ansible_machine] }}/rstudio-server-{{ rstudio_server_version }}-{{ rstudio_server_machine_map[ansible_machine] }}.deb"
diff --git a/vars/_focal.yml b/vars/_focal.yml
@@ -0,0 +1,3 @@
+# vars file
+---
+rstudio_server_download_url: "https://download2.rstudio.org/server/focal/{{ rstudio_server_machine_map[ansible_machine] }}/rstudio-server-{{ rstudio_server_version }}-{{ rstudio_server_machine_map[ansible_machine] }}.deb"
diff --git a/vars/_noble.yml b/vars/_noble.yml
@@ -0,0 +1,3 @@
+# vars file
+---
+rstudio_server_download_url: "https://download2.rstudio.org/server/jammy/{{ rstudio_server_machine_map[ansible_machine] }}/rstudio-server-{{ rstudio_server_version }}-{{ rstudio_server_machine_map[ansible_machine] }}.deb"