diff --git a/.travis.yml b/.travis.yml index 288fe502a728dd7564a52a759624c1cba58138c5..9e105c34e226dc01debc4af7344d0ab9cd5f8330 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,11 +5,16 @@ dist: trusty sudo: false group: beta services: [docker] +cache: + - pip + - directories: + - $HOME/.pre-commit + - $HOME/virtualenv install: - git submodule init - git submodule update --remote - - pip install -r tests/requirements.txt + - pip install -r tests/requirements.txt | cat - ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles - molecule dependency diff --git a/README.rst b/README.rst index 59b51a420054a5c7c829a253538a9f5b9381a860..143b0eb546f3a7132e9ef2b33cfbe472838bced0 100644 --- a/README.rst +++ b/README.rst @@ -1,6 +1,9 @@ CA store ######## +.. image:: https://travis-ci.org/adarnimrod/ca-store.svg?branch=master + :target: https://travis-ci.org/adarnimrod/ca-store + An Ansible role to setup the CA store. The end goal is too have the same setup on both OSes, meaning: diff --git a/molecule.yml b/molecule.yml index 9de1bd0bb3f1b4b88bbfe8c14a07634d462ac2ba..56ea71494928e9db671b63c7da1a80cbdce510f6 100644 --- a/molecule.yml +++ b/molecule.yml @@ -5,7 +5,7 @@ ansible: diff: True config_file: ../ansible.cfg -dependencies: +dependency: name: galaxy requirements_file: tests/requirements.yml @@ -16,7 +16,7 @@ vagrant: platforms: - name: openbsd box: kaorimatz/openbsd-6.0-amd64 - - name: debian + - name: jessie box: debian/jessie64 instances: - name: ca-store @@ -33,8 +33,15 @@ docker: - name: ca-store-xenial image: ubuntu image_version: xenial + command: /sbin/init + cap_add: + - SYS_ADMIN + volume_mounts: + - /sys/fs/cgroup:/sys/fs/cgroup + - /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket environment: DEBIAN_FRONTEND: noninteractive + container: docker - name: ca-store-trusty image: ubuntu image_version: trusty @@ -43,5 +50,12 @@ docker: - name: ca-store-jessie image: debian image_version: jessie + command: /sbin/init + cap_add: + - SYS_ADMIN + volume_mounts: + - /sys/fs/cgroup:/sys/fs/cgroup + - /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket environment: DEBIAN_FRONTEND: noninteractive + container: docker diff --git a/tests/playbook.yml b/tests/playbook.yml index 895909f85f72d26aa8b74b6303b84d192cc0f557..d098a3162ff3e4de5eddd19700c392a7c0f6a418 100644 --- a/tests/playbook.yml +++ b/tests/playbook.yml @@ -3,6 +3,10 @@ gather_facts: false roles: [adarnimrod.openbsd-bootstrap] +- hosts: ca-store-xenial + gather_facts: false + roles: [adarnimrod.debian-bootstrap] + - hosts: all roles: [ ca-store ] post_tasks: diff --git a/tests/requirements.txt b/tests/requirements.txt index db304aa969372e2b07281c303b4cef86529b67f9..e5f79844d81f1165ee60b49fabe9effe5012fed8 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,6 +1,6 @@ ansible==2.2.0.0 -testinfra==1.4.3 -molecule==1.14.0 +testinfra==1.4.4 +molecule==1.15.0 ansible-lint==3.4.4 pre-commit==0.9.3 piprot==0.9.7