Implement new role based testing rig + clearer idempotence testing

Author: David Farrington

.travis.yml

@@ -14,10 +14,13 @@ install:
   - pip install ansible==1.8.4
 script:
   - echo localhost > inventory
-  - ansible-playbook -i inventory test.yml --syntax-check
-  - ansible-playbook -i inventory test.yml --connection=local --sudo -e "postgresql_version=$POSTGRESQL_VERSION"
-  - >
-    ansible-playbook -i inventory test.yml --connection=local --sudo -e "postgresql_version=$POSTGRESQL_VERSION"
-    | grep -q 'changed=0.*failed=0'
-    && (echo 'Idempotence test: pass' && exit 0)
-    || (echo 'Idempotence test: fail' && exit 1)
+
+  # Syntax check
+  - ansible-playbook -i inventory tests/test.yml --syntax-check
+
+  # Play test
+  - ansible-playbook -i inventory tests/test.yml --connection=local --sudo -e "postgresql_version=$POSTGRESQL_VERSION"
+
+  # Idempotence test
+  - ansible-playbook -i inventory tests/test.yml --connection=local --sudo -e "postgresql_version=$POSTGRESQL_VERSION" > idempotence_out
+  - ./tests/idempotence_check.sh idempotence_out

Vagrantfile

@@ -7,7 +7,7 @@ Vagrant.configure('2') do |config|
     c.vm.network :private_network, ip: '192.168.88.22'
     c.vm.hostname = 'anxs.local'
     c.vm.provision 'ansible' do |ansible|
-      ansible.playbook = 'test.yml'
+      ansible.playbook = 'tests/test.yml'
       ansible.sudo = true
       ansible.inventory_path = 'vagrant-inventory'
       ansible.host_key_checking = false

ansible.cfg

@@ -0,0 +1,2 @@
+[defaults]
+roles_path = ../

idempotence_check.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# Process the output of the given file (should contain a plays stdout/err)
+# If we pass, return with 0 else return with 1, and print useful output
+
+_file="$1"
+
+# Assert filename has been passed
+[ $# -eq 0 ] && { echo "Usage: $0 filename"; exit 1; }
+
+# Assert file exists
+[ ! -f "$_file" ] && { echo "$0: $_file file not found."; exit 2; }
+
+# Make sure nothing has changed or failed
+grep -q 'changed=0.*failed=0' $_file
+
+# Success condition
+if [ $? -eq 0 ]; then
+    echo 'Idempotence test: pass'
+    exit
+
+# Failure condition, extract useful information and exit
+else
+    echo 'Idempotence test: fail'
+    echo ''
+    grep --color=auto -B1 -A1 "\(changed\|failed\):" $_file
+    exit 1
+fi

test.yml

@@ -0,0 +1,7 @@
+---
+
+- hosts: all
+  remote_user: root
+  sudo: yes
+  roles:
+    - postgresql

tests/test.yml

@@ -1,2 +1,2 @@
 [anxs]
-anxs.local ansible_ssh_host=192.168.88.22 ansible_ssh_port=22
+anxs.local ansible_ssh_host=192.168.88.22 ansible_ssh_port=22 ansible_ssh_user=vagrant