Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make rstudio_download_url more configurable #17

Merged
merged 6 commits into from
Mar 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,12 @@ jobs:
fail-fast: false
matrix:
include:
- distro: debian9
- distro: debian10
- distro: debian11
- distro: debian12
- distro: ubuntu1804
- distro: ubuntu2004
- distro: ubuntu2204

steps:
- name: Check out the codebase
Expand All @@ -61,8 +63,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
Expand Down
24 changes: 19 additions & 5 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ boxes = [
:box => "bento/ubuntu-20.04",
:ip => '10.0.0.14',
:cpu => "50",
:ram => "384"
:ram => "512"
},
{
:name => "debian-9",
:box => "bento/debian-9",
:ip => '10.0.0.17',
:name => "ubuntu-2204",
:box => "bento/ubuntu-22.04",
:ip => '10.0.0.15',
:cpu => "50",
:ram => "256"
:ram => "512"
},
{
:name => "debian-10",
Expand All @@ -32,6 +32,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 => "256"
},
]

Vagrant.configure("2") do |config|
Expand Down
1 change: 1 addition & 0 deletions defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# defaults file
---
rstudio_version: '2023.03.1-446'
rstudio_download_url: "{{ rstudio_preset_download_url }}"
rstudio_install: []
4 changes: 3 additions & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@ galaxy_info:
versions:
- bionic
- focal
- jammy
- name: Debian
versions:
- stretch
- buster
- bullseye
- bookworm
galaxy_tags:
- development
- system
Expand Down
6 changes: 1 addition & 5 deletions molecule/default/collections.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
---
collections:
- name: community.docker
version: '>=1.2.0,<2'
- name: community.general
version: '>=2,<3'
collections: []
2 changes: 1 addition & 1 deletion molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions vars/_bookworm.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# vars file
---
rstudio_preset_download_url: "https://download1.rstudio.org/electron/jammy/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
3 changes: 3 additions & 0 deletions vars/_bullseye.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# vars file
---
rstudio_preset_download_url: "https://download1.rstudio.org/electron/bionic/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
3 changes: 3 additions & 0 deletions vars/_buster.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# vars file
---
rstudio_preset_download_url: "https://download1.rstudio.org/electron/bionic/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
2 changes: 1 addition & 1 deletion vars/_default.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# vars file
---
rstudio_download_url: "https://download1.rstudio.org/electron/bionic/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
rstudio_preset_download_url: "https://download1.rstudio.org/electron/{{ ansible_distribution_release }}/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
3 changes: 3 additions & 0 deletions vars/_focal.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# vars file
---
rstudio_preset_download_url: "https://download1.rstudio.org/electron/bionic/{{ rstudio_machine_map[ansible_machine] }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
2 changes: 1 addition & 1 deletion vars/_stretch.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# vars file
---
rstudio_download_url: "https://download1.rstudio.org/electron/debian9/{{ ansible_machine }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
rstudio_preset_download_url: "https://download1.rstudio.org/electron/debian9/{{ ansible_machine }}/rstudio-{{ rstudio_version }}-{{ rstudio_machine_map[ansible_machine] }}.deb"
Loading