From a3e664b0691912c57665a29acf104fdc732042d6 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Tue, 25 Sep 2018 22:26:43 -0500 Subject: [PATCH] Switch tests to use Molecule. --- .gitignore | 3 +- .travis.yml | 40 +++++++++---------- molecule/default/molecule.yml | 25 ++++++++++++ .../test.yml => molecule/default/playbook.yml | 8 ++-- molecule/default/tests/test_default.py | 14 +++++++ tests/README.md | 11 ----- 6 files changed, 64 insertions(+), 37 deletions(-) create mode 100644 molecule/default/molecule.yml rename tests/test.yml => molecule/default/playbook.yml (74%) create mode 100644 molecule/default/tests/test_default.py delete mode 100644 tests/README.md diff --git a/.gitignore b/.gitignore index c9b2377..f56f5b5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.retry -tests/test.sh +*/__pycache__ +*.pyc diff --git a/.travis.yml b/.travis.yml index 5d3b1be..0631078 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,31 +1,31 @@ --- +language: python services: docker env: - - distro: centos7 - - distro: ubuntu1604 - - distro: ubuntu1404 - - distro: debian9 - - distro: debian8 + global: + - ROLE_NAME: nginx + matrix: + - MOLECULE_DISTRO: centos7 + MOLECULE_DOCKER_COMMAND: /usr/lib/systemd/systemd + - MOLECULE_DISTRO: ubuntu1604 + - MOLECULE_DISTRO: ubuntu1404 + - MOLECULE_DISTRO: debian9 + - MOLECULE_DISTRO: debian8 -script: - # Configure test script so we can run extra tests after playbook is run. - - export container_id=$(date +%s) - - export cleanup=false +install: + # Install test dependencies. + - pip install molecule docker - # Download test shim. - - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/ - - chmod +x ${PWD}/tests/test.sh +before_script: + # Use actual Ansible Galaxy role name for the project directory. + - cd ../ + - mv ansible-role-$ROLE_NAME geerlingguy.$ROLE_NAME + - cd geerlingguy.$ROLE_NAME +script: # Run tests. - - ${PWD}/tests/test.sh - - # Setup test site. - - 'docker exec ${container_id} mkdir -p /var/www/test' - - 'docker exec ${container_id} bash -c "echo Success >| /var/www/test/index.html"' - - # Make sure virtualhost exists. - - 'docker exec --tty ${container_id} env TERM=xterm curl http://localhost/ | grep "Success"' + - molecule test notifications: webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml new file mode 100644 index 0000000..e3d6e33 --- /dev/null +++ b/molecule/default/molecule.yml @@ -0,0 +1,25 @@ +--- +dependency: + name: galaxy +driver: + name: docker +lint: + name: yamllint +platforms: + - name: instance + image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible + command: ${MOLECULE_DOCKER_COMMAND:-"sleep infinity"} + privileged: true + pre_build_image: true +provisioner: + name: ansible + lint: + name: ansible-lint + playbooks: + converge: ${MOLECULE_PLAYBOOK:-playbook.yml} +scenario: + name: default +verifier: + name: testinfra + lint: + name: flake8 diff --git a/tests/test.yml b/molecule/default/playbook.yml similarity index 74% rename from tests/test.yml rename to molecule/default/playbook.yml index 9ae8960..ee65197 100644 --- a/tests/test.yml +++ b/molecule/default/playbook.yml @@ -1,5 +1,6 @@ --- -- hosts: all +- name: Converge + hosts: all vars: nginx_use_ppa: true @@ -14,8 +15,5 @@ when: ansible_os_family == 'Debian' changed_when: false - - name: Install dependencies. - package: name=curl state=present - roles: - - role_under_test + - role: geerlingguy.nginx diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py new file mode 100644 index 0000000..eedd64a --- /dev/null +++ b/molecule/default/tests/test_default.py @@ -0,0 +1,14 @@ +import os + +import testinfra.utils.ansible_runner + +testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( + os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all') + + +def test_hosts_file(host): + f = host.file('/etc/hosts') + + assert f.exists + assert f.user == 'root' + assert f.group == 'root' diff --git a/tests/README.md b/tests/README.md deleted file mode 100644 index 6fb2117..0000000 --- a/tests/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# Ansible Role tests - -To run the test playbook(s) in this directory: - - 1. Install and start Docker. - 1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`: - - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/` - 1. Make the test shim executable: `chmod +x tests/test.sh`. - 1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh` - -If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`