From 43ac4198eb7a1ab193235020bd24205e3eed9b39 Mon Sep 17 00:00:00 2001 From: Mischa ter Smitten Date: Fri, 8 Nov 2024 15:53:49 +0100 Subject: [PATCH 1/3] 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 From e0f59ed514124bf4bc161335049272eaf2ec50d9 Mon Sep 17 00:00:00 2001 From: Mischa ter Smitten Date: Fri, 8 Nov 2024 16:07:51 +0100 Subject: [PATCH 2/3] Fix failing tests --- README.md | 2 +- defaults/main.yml | 2 +- vars/_bookworm.yml | 3 +++ vars/_bullseye.yml | 3 +++ vars/_focal.yml | 3 +++ vars/_noble.yml | 3 +++ 6 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 vars/_bookworm.yml create mode 100644 vars/_bullseye.yml create mode 100644 vars/_focal.yml create mode 100644 vars/_noble.yml diff --git a/README.md b/README.md index 7073d52..5810a25 100644 --- 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/defaults/main.yml b/defaults/main.yml index c3c62ec..28d83c7 100644 --- 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/vars/_bookworm.yml b/vars/_bookworm.yml new file mode 100644 index 0000000..168d05d --- /dev/null +++ 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 new file mode 100644 index 0000000..fca98f1 --- /dev/null +++ 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 new file mode 100644 index 0000000..fca98f1 --- /dev/null +++ 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 new file mode 100644 index 0000000..168d05d --- /dev/null +++ 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" From ca214731e2d45103dba9aded626f72cf0bc71391 Mon Sep 17 00:00:00 2001 From: Mischa ter Smitten Date: Fri, 8 Nov 2024 16:15:24 +0100 Subject: [PATCH 3/3] Remove unsupported versions --- .github/workflows/ci.yml | 3 --- Vagrantfile | 14 -------------- meta/main.yml | 2 -- 3 files changed, 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 70e6297..54e0ae1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,11 +44,8 @@ jobs: fail-fast: false matrix: include: - - distro: debian10 - distro: debian11 - distro: debian12 - - distro: ubuntu1804 - ansible-version: '>=9, <10' - distro: ubuntu2004 - distro: ubuntu2204 - distro: ubuntu2404 diff --git a/Vagrantfile b/Vagrantfile index e86d32d..187d831 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -4,13 +4,6 @@ role = File.basename(File.expand_path(File.dirname(__FILE__))) boxes = [ - { - :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", @@ -32,13 +25,6 @@ boxes = [ :cpu => "50", :ram => "512" }, - { - :name => "debian-10", - :box => "bento/debian-10", - :ip => '10.0.0.18', - :cpu => "50", - :ram => "256" - }, { :name => "debian-11", :box => "bento/debian-11", diff --git a/meta/main.yml b/meta/main.yml index a10edf2..1f4b08e 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -10,13 +10,11 @@ galaxy_info: platforms: - name: Ubuntu versions: - - bionic - focal - jammy - noble - name: Debian versions: - - buster - bullseye - bookworm galaxy_tags: