Skip to content

Commit

Permalink
test: unify, molecule 1.21 travis
Browse files Browse the repository at this point in the history
  • Loading branch information
popstas committed Mar 16, 2017
1 parent da5c8c9 commit 89d87ae
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

test:
script:
- molecule --debug test
- molecule test
14 changes: 9 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
---

language: python
python: "2.7"
sudo: required
services:
- docker

install: pip install molecule docker-py
script:
before_install:
- sudo apt-get -qq update
- sudo apt-get install -o Dpkg::Options::="--force-confold" --force-yes -y docker-engine
install:
- pip install molecule docker
before_script:
- export MOLECULE_APTPROXY_PATH="$PWD/00aptproxy" && touch "$MOLECULE_APTPROXY_PATH"
- molecule --debug test
script:
- molecule test

notifications:
webhooks: https://galaxy.ansible.com/api/v1/notifications/
webhooks: https://galaxy.ansible.com/api/v1/notifications/
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# ansible-role-server-scripts
[![Build Status](https://travis-ci.org/viasite-ansible/ansible-role-server-scripts.svg?branch=master)](https://travis-ci.org/viasite-ansible/ansible-role-server-scripts)

Install [viasite/server-scripts](https://github.com/popstas/server-scripts).

## Required variables:
- server_scripts_mailto
- server_scripts_backups_dbdump_remote_user
- server_scripts_backups_dbdump_remote_host

Also check cron tasks.
Also check cron tasks.
9 changes: 2 additions & 7 deletions molecule.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
---
dependency:
name: galaxy

driver:
name: docker
docker:
containers:
- name: ansible-role-server-scripts
- name: ansible-role-server-scripts-1604
image: ubuntu
image_version: latest
image_version: 16.04
volume_mounts:
- ${MOLECULE_APTPROXY_PATH}:/etc/apt/apt.conf.d/00aptproxy
ansible_groups:
- group1

ansible:
playbook: tests/playbook.yml

0 comments on commit 89d87ae

Please sign in to comment.