diff --git a/.ansible-lint b/.ansible-lint index 4fa3dff..d130bd5 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -2,4 +2,5 @@ skip_list: - 305 - 306 + - 208 use_default_rules: true diff --git a/.travis.yml b/.travis.yml index 15dbad4..24953ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,21 +1,25 @@ --- language: python -services: - - docker +services: docker -before_install: - - sudo apt-get -qq update +# Ensure pip is present +addons: + apt: + packages: + - python-pip + +install: + # Install required packages + - pip install molecule yamllint ansible-lint flake8 testinfra docker env: global: - ROLE_NAME: avicontroller matrix: - - MOLECULE_DISTRO: centos:7 + - MOLECULE_DISTRO: centos:8 MOLECULE_SERVICE_MANAGER: systemd MOLECULE_COMMAND: /usr/sbin/init -install: - - pip install testinfra molecule docker before_script: - cd ../ diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 65faca2..5227539 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -3,16 +3,16 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: instance - image: centos:7 + image: docker.io/pycontribs/centos:8 + pre_build_image: true +lint: | + set -e + yamllint . + ansible-lint + flake8 provisioner: name: ansible - lint: - name: ansible-lint verifier: - name: testinfra - lint: - name: flake8 + name: testinfra \ No newline at end of file diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py index eedd64a..305da16 100644 --- a/molecule/default/tests/test_default.py +++ b/molecule/default/tests/test_default.py @@ -3,12 +3,13 @@ import testinfra.utils.ansible_runner testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( - os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all') + os.environ["MOLECULE_INVENTORY_FILE"] +).get_hosts("all") def test_hosts_file(host): - f = host.file('/etc/hosts') + f = host.file("/etc/hosts") assert f.exists - assert f.user == 'root' - assert f.group == 'root' + assert f.user == "root" + assert f.group == "root"