diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e2bc34..0959469 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/Vagrantfile b/Vagrantfile index 8868feb..6e225bf 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,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" }, ] diff --git a/meta/main.yml b/meta/main.yml index f6f1c69..4713202 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -11,9 +11,9 @@ galaxy_info: platforms: - name: Ubuntu versions: - - xenial - bionic - focal + - jammy galaxy_tags: - system - r 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 diff --git a/tasks/install.yml b/tasks/install.yml index 8aab5f6..cabd5cf 100644 --- a/tasks/install.yml +++ b/tasks/install.yml @@ -2,7 +2,7 @@ --- - name: install | dependencies 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) }}" diff --git a/vars/main.yml b/vars/main.yml index 7197f47..c9bf11c 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -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 }}"