From 89d87aea85f98259576db51caf9ff6d88be36976 Mon Sep 17 00:00:00 2001
From: Stanislav Popov <popstas@tagilcity.ru>
Date: Thu, 16 Mar 2017 15:31:48 +0500
Subject: [PATCH] test: unify, molecule 1.21 travis

---
 .gitlab-ci.yml |  2 +-
 .travis.yml    | 14 +++++++++-----
 README.md      |  5 +++--
 molecule.yml   |  9 ++-------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ada9174..ad22ddf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,4 +2,4 @@
 
 test:
   script:
-    - molecule --debug test
+    - molecule test
diff --git a/.travis.yml b/.travis.yml
index ba38572..64f7fb5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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/
\ No newline at end of file
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/README.md b/README.md
index 3b30ae2..4c16d19 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
-# 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:
@@ -6,4 +7,4 @@ Install [viasite/server-scripts](https://github.com/popstas/server-scripts).
 - server_scripts_backups_dbdump_remote_user
 - server_scripts_backups_dbdump_remote_host
 
-Also check cron tasks.
\ No newline at end of file
+Also check cron tasks.
diff --git a/molecule.yml b/molecule.yml
index be27b7b..c9705a9 100644
--- a/molecule.yml
+++ b/molecule.yml
@@ -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