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

Fix failing tests #57

Merged
merged 1 commit into from
Dec 4, 2023
Merged
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
Fix failing tests
tersmitten committed Dec 4, 2023
commit 6fc346e02b987284ad97c57b14ae23815481f065
11 changes: 3 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -44,14 +44,9 @@ jobs:
fail-fast: false
matrix:
include:
- distro: debian8
- distro: debian9
- distro: debian10
- distro: ubuntu1604
ansible-version: '>=2.10, <2.11'
- distro: ubuntu1604
- distro: ubuntu1804
- distro: ubuntu2004
- distro: ubuntu2204

steps:
- name: Check out the codebase
@@ -65,8 +60,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
16 changes: 8 additions & 8 deletions Vagrantfile
Original file line number Diff line number Diff line change
@@ -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,7 +16,14 @@ 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 => "512"
},
]

2 changes: 1 addition & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
@@ -11,9 +11,9 @@ galaxy_info:
platforms:
- name: Ubuntu
versions:
- xenial
- bionic
- focal
- jammy
galaxy_tags:
- system
- r
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
@@ -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
2 changes: 1 addition & 1 deletion tasks/install.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# tasks file
---
- name: install | dependencies

Check warning on line 3 in tasks/install.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.
ansible.builtin.apt:
name: "{{ r_dependencies }}"
name: "{{ ' '.join(r_dependencies).split() }}"
state: "{{ apt_install_state | default('latest') }}"
update_cache: true
cache_valid_time: "{{ apt_update_cache_valid_time | default(3600) }}"
tags:
- r-install-dependencies

- name: install | additional

Check warning on line 12 in tasks/install.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.
ansible.builtin.apt:
name: "{{ r_install }}"
state: "{{ apt_install_state | default('latest') }}"
3 changes: 1 addition & 2 deletions vars/main.yml
Original file line number Diff line number Diff line change
@@ -10,10 +10,9 @@ r_dependencies_pre:
- dirmngr
- apt-transport-https

r_dependencies_dummy_package: apt
r_dependencies:
- r-base
- "{{ r_install_dev | ternary('r-base-dev', r_dependencies_dummy_package) }}"
- "{{ r_install_dev | ternary('r-base-dev', '') }}"

r_packages_from_github: "{{ r_packages | selectattr('type', 'defined') | selectattr('type', 'equalto', 'github') | map(attribute='name') | list | length > 0 }}"


Unchanged files with check annotations Beta

---
- name: Converge

Check warning on line 2 in molecule/default/converge.yml

GitHub Actions / Lint

role-name[path]

Avoid using paths when importing roles. (../../../)
hosts: all
become: true
roles:
# tasks file
---
- name: repository

Check warning on line 3 in tasks/main.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.
ansible.builtin.import_tasks: repository.yml
tags:
- configuration
- r
- r-repository
- name: install

Check warning on line 10 in tasks/main.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.
ansible.builtin.import_tasks: install.yml
tags:
- configuration
- r
- r-install
- name: packages

Check warning on line 17 in tasks/main.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.
ansible.builtin.import_tasks: packages.yml
tags:
- configuration
# tasks file
---
- name: packages | copy r scripts

Check warning on line 3 in tasks/packages.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.
ansible.builtin.template:
src: "{{ item.src }}"
dest: "{{ r_scripts_install_path }}/{{ item.dest }}"
tags:
- r-packages-copy-r-scripts
- name: installed packages

Check warning on line 26 in tasks/packages.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.
when: r_list_packages_once | bool
tags:
- r-packages-list-installed
block:
- name: packages | list installed packages

Check warning on line 31 in tasks/packages.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.
ansible.builtin.command: >
R-list-installed-packages {{ r_packages_lib }}
environment: "{{ r_environment }}"
register: _r_installed_packages
changed_when: false
- name: packages | set_fact list installed packages

Check warning on line 38 in tasks/packages.yml

GitHub Actions / Lint

name[casing]

All names should start with an uppercase letter.
ansible.builtin.set_fact:
r_installed_packages: "{{ _r_installed_packages.stdout_lines }}"