test: unify, molecule 1.21 travis

viasite-ansible · Mar 16, 2017 · 0ac4613 · 0ac4613
1 parent cf2f8ac
commit 0ac4613
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 20 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -3,4 +3,4 @@ test:
   tags:
     - vagrant
   script:
-    - molecule --debug test
+    - molecule test
diff --git a/meta/main.yml b/meta/main.yml
@@ -9,8 +9,8 @@ galaxy_info:
   platforms:
   - name: Ubuntu
     versions:
-    - all
-  categories:
+      - trusty
+      - xenial
+  galaxy_tags:
     - system
-
 dependencies: []
diff --git a/molecule.yml b/molecule.yml
@@ -1,30 +1,16 @@
 ---
-dependency:
-  name: galaxy
-
-# cannot test with docker
+# cannot test with docker: /etc/hosts not writable
 driver:
   name: vagrant
 vagrant:
   platforms:
     - name: xenial64
       box: bento/ubuntu-16.04
-      ansible_groups:
-        - group1
   providers:
     - name: virtualbox
       type: virtualbox
-      options:
-        memory: 512
-        cpus: 2
   instances:
     - name: vagrant-01
-      ansible_groups:
-        - group_1
-      interfaces:
-        - network_name: private_network
-          type: dhcp
-          auto_config: true
 
 ansible:
   playbook: tests/playbook.yml

diff --git a/tests/playbook.yml b/tests/playbook.yml
@@ -1,4 +1,4 @@
 ---
 - hosts: all
   roles:
-    - ""
+    - ansible-role-hostname
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,4 +3,4 @@ test: @@
       tags:
         - vagrant
       script:
-        - molecule --debug test
+        - molecule test