Commit dd768002 authored by nimrod's avatar nimrod
Browse files

- Seperate tests (pre-commit and molecule) using tox.

parent 1ba0eade

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -9,3 +9,4 @@ __pycache__ 
.vagrant/

*.log

*.retry

.tox

.travis.yml

+11 −13
Original line number Diff line number Diff line
@@ -8,14 +8,15 @@ env: 
    global:

        - VBOX_MEMORY=2048

    matrix:

        - platform: openbsd60

        - &openbsd59 platform=openbsd59

        - platform: xenial

        - platform: trusty

        - platform: precise

        - &stretch platform=stretch

        - platform: jessie

        - platform: wheezy

        - TOXENV=pre-commit

        - TOXENV=openbsd60

        - &openbsd59 TOXENV=openbsd59

        - TOXENV=xenial

        - TOXENV=trusty

        - TOXENV=precise

        - &stretch TOXENV=stretch

        - TOXENV=jessie

        - TOXENV=wheezy

matrix:

    fast_finish: True

    allow_failures:
@@ -32,13 +33,10 @@ install: 
  - sudo apt-get install -y linux-headers-$(uname -r) virtualbox

  - wget https://releases.hashicorp.com/vagrant/1.9.1/vagrant_1.9.1_x86_64.deb

  - sudo dpkg -i vagrant_1.9.1_x86_64.deb

  - pip install -r tests/requirements.txt | cat

  - ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles

  - molecule dependency

  - pip install tox | cat



script:

  - pre-commit run --all-files

  - travis_wait 45 molecule test --platform $platform

  - travis_wait 45 tox



notifications:

  webhooks: https://galaxy.ansible.com/api/v1/notifications/

molecule.yml

+4 −0
Original line number Diff line number Diff line
@@ -5,6 +5,10 @@ ansible: 
  diff: True

  config_file: ../ansible.cfg



molecule:

  ignore_paths:

  - .tox



dependency:

  name: galaxy

  requirements_file: tests/requirements.yml

tox.ini

0 → 100644
+22 −0
Original line number Diff line number Diff line 
[tox]

skip_install = True

skipsdist = True

envlist = openbsd60,openbsd59,xenial,trusty,precise,stretch,jessie,wheezy



[testenv:pre-commit]

deps = -rtests/requirements.txt

whitelist_externals =

    sh

commands =

    sh -c "ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles"

    molecule dependency

    pre-commit run --all-files



[testenv]

deps = -rtests/requirements.txt

passenv = HOME

whitelist_externals =

    sh

commands =

    sh -c "ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles"

    molecule test --platform {envname}