Merge pull request #42 from Oefenweb/cs-fixes

Make use of fully-qualified collection name

Author: tersmitten

.github/workflows/ci.yml

@@ -23,7 +23,9 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies
-        run: pip install ansible-lint[community,yamllint]
+        run: |
+          pip install ansible-lint
+          ansible-galaxy install -r requirements.yml
 
       - name: Lint code
         run: |
@@ -43,11 +45,8 @@ jobs:
       matrix:
         include:
           - distro: debian8
-            ansible-version: '<2.10'
           - distro: debian9
           - distro: debian10
-          - distro: ubuntu1604
-            ansible-version: '>=2.9, <2.10'
           - distro: ubuntu1604
             ansible-version: '>=2.10, <2.11'
           - distro: ubuntu1604

Dockerfile

@@ -1,17 +1,20 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 MAINTAINER Mischa ter Smitten <mtersmitten@oefenweb.nl>
 
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8
+
 # python
 RUN apt-get update && \
-  DEBIAN_FRONTEND=noninteractive apt-get install -y python-minimal python-dev curl && \
+  DEBIAN_FRONTEND=noninteractive apt-get install -y python3-minimal python3-dev curl && \
   apt-get clean
-RUN curl -sL https://bootstrap.pypa.io/pip/2.7/get-pip.py | python -
+RUN curl -sL https://bootstrap.pypa.io/pip/3.6/get-pip.py | python3 -
 RUN rm -rf $HOME/.cache
 
 # ansible
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y gcc libffi-dev libssl-dev && \
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y python3-apt && \
   apt-get clean
-RUN pip install ansible==2.9.15
+RUN pip3 install ansible==2.10.7
 RUN rm -rf $HOME/.cache
 
 # provision

meta/main.yml

@@ -1,13 +1,12 @@
 # meta file
 ---
 galaxy_info:
-  namespace: oefenweb
+  author: oefenweb
   role_name: apt
-  author: Mischa ter Smitten
   company: Oefenweb.nl B.V.
   description: Manage packages and up(date|grade)s in Debian-like systems
   license: MIT
-  min_ansible_version: 2.9.0
+  min_ansible_version: 2.10.0
   platforms:
     - name: Ubuntu
       versions:

molecule/default/collections.yml

@@ -0,0 +1,6 @@
+---
+collections:
+  - name: community.docker
+    version: '>=1.2.0,<2'
+  - name: community.general
+    version: '>=2,<3'

requirements.yml

@@ -0,0 +1,3 @@
+# requirements file
+---
+collections: []

tasks/main.yml

@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: update configuration file - /etc/apt/sources.list
-  template:
+  ansible.builtin.template:
     src: "etc/apt/sources.list.{{ ansible_distribution }}.j2"
     dest: /etc/apt/sources.list
     owner: root
@@ -15,7 +15,7 @@
     - apt-configuration
 
 - name: update configuration file - /etc/apt/apt.conf
-  template:
+  ansible.builtin.template:
     src: "{{ apt_apt_conf_file.lstrip('/') }}.j2"
     dest: "{{ apt_apt_conf_file }}"
     owner: root
@@ -28,7 +28,7 @@
     - apt-configuration
 
 - name: remove configuration files - /etc/apt/apt.conf.d/*
-  file:
+  ansible.builtin.file:
     path: "/etc/apt/apt.conf.d/{{ item }}"
     state: absent
   with_items: "{{ apt_etc_apt_apt_conf_d_files_absent }}"
@@ -38,7 +38,7 @@
     - apt-configuration
 
 - name: ensure directory exists - /var/lib/apt/lists/
-  file:
+  ansible.builtin.file:
     path: /var/lib/apt/lists/
     state: directory
     owner: root
@@ -50,7 +50,7 @@
     - apt-update
 
 - name: update
-  apt:
+  ansible.builtin.apt:
     update_cache: true
     cache_valid_time: "{{ 0 if apt_config_updated is defined and apt_config_updated.changed else apt_update_cache_valid_time }}"
   when: apt_update
@@ -60,7 +60,7 @@
     - apt-update
 
 - name: dpkg --configure
-  command: >
+  ansible.builtin.command: >
     dpkg --configure -a
   args:
     warn: false
@@ -73,7 +73,7 @@
     - apt-dpkg-configure
 
 - name: install dependencies
-  apt:
+  ansible.builtin.apt:
     name: "{{ apt_dependencies }}"
     state: "{{ apt_install_state }}"
   tags:
@@ -82,7 +82,7 @@
     - apt-dependencies
 
 - name: upgrade
-  apt:
+  ansible.builtin.apt:
     upgrade: "{{ apt_upgrade_type }}"
     update_cache: true
     dpkg_options: "{{ apt_upgrade_dpkg_options | join(',') }}"
@@ -93,7 +93,7 @@
     - apt-upgrade
 
 - name: clean
-  command: >
+  ansible.builtin.command: >
     apt-get -y clean
   args:
     warn: false
@@ -105,7 +105,7 @@
     - apt-clean
 
 - name: install
-  apt:
+  ansible.builtin.apt:
     name: "{{ apt_install }}"
     state: "{{ apt_install_state }}"
   tags:
@@ -114,7 +114,7 @@
     - apt-install
 
 - name: remove
-  apt:
+  ansible.builtin.apt:
     name: "{{ apt_remove }}"
     state: absent
     purge: "{{ apt_remove_purge }}"
@@ -124,7 +124,7 @@
     - apt-remove
 
 - name: autoremove
-  apt:
+  ansible.builtin.apt:
     autoremove: true
     dpkg_options: "{{ apt_upgrade_dpkg_options | join(',') }}"
   when: apt_autoremove