Commit f308da93 authored by nimrod's avatar nimrod
Browse files

Merge branch 'travisci'

parents a82f5bde 82fb23c5
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@
    -   id: check-merge-conflict
    -   id: flake8
    -   id: check-symlinks
-   repo: https://www.shore.co.il/git/ansible-pre-commit
-   repo: https://github.com/adarnimrod/ansible-pre-commit.git
    sha: 0fadd691465b97db8992cfc66650f630e433324b
    hooks:
    -   id: ansible-syntax-check

.travis.yml

0 → 100644
+19 −0
Original line number Diff line number Diff line
---
language: python
python: "2.7"
dist: trusty
sudo: false
group: beta
services: [docker]

install:
  - pip install -r tests/requirements.txt
  - ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles
  - molecule dependency

script:
  - pre-commit run --all-files
  - molecule test --driver docker

notifications:
  webhooks: https://galaxy.ansible.com/api/v1/notifications/
+3 −2
Original line number Diff line number Diff line
@@ -29,8 +29,9 @@ See :code:`tests/playbook.yml`.
Testing
-------

Testing requires Virtualbox, Vagrant and Python 2.7. Install the Python
dependencies, dependent roles and roles required for testing:
Testing requires Python 2.7 and either Docker or Vagrant and Virtualbox.
Install the Python dependencies, dependent roles and roles required for
testing:

.. code:: shell

+6 −0
Original line number Diff line number Diff line
@@ -27,3 +27,9 @@ vagrant:
  - 'vbguest.auto_update = false'
  - 'landrush.enabled = false'
  - 'landrush_ip.override = false'

docker:
  containers:
  - name: ansible-role-example-ubuntu
    image: ubuntu
    image_version: xenial
+2 −0
Original line number Diff line number Diff line
@@ -4,3 +4,5 @@ molecule==1.14.0
ansible-lint==3.4.4
pre-commit==0.9.3
piprot==0.9.7
python-vagrant==0.5.14
docker-py==1.10.6
Loading