diff --git a/.travis.yml b/.travis.yml index 0a133fb..160af33 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,7 @@ language: "python" python: "2.7" env: - - SITE_SYSTEM_AND_INVENTORY="tests/test_system.yml -i tests/inventory" - - SITE_HOME_AND_INVENTORY="tests/test_home.yml -i tests/inventory" + - SITE_AND_INVENTORY="tests/test.yml -i tests/inventory" before_install: - "__rvm_unload ; rm -rf ~/.rvm" @@ -14,28 +13,20 @@ install: - "printf '[defaults]\nroles_path = ../' > ansible.cfg" script: - - "ansible-playbook $SITE_SYSTEM_AND_INVENTORY --syntax-check" - - "ansible-playbook $SITE_SYSTEM_AND_INVENTORY --connection=local -vvvv" - > - ansible-playbook $SITE_SYSTEM_AND_INVENTORY --connection=local + ruby -v + | grep -q 'ruby' + && (echo 'No ruby test: pass' && exit 1) + || (echo 'No ruby test: fail' && exit 0) + - "ansible-playbook $SITE_AND_INVENTORY --syntax-check" + - "ansible-playbook $SITE_AND_INVENTORY --connection=local -vvvv" + - > + ansible-playbook $SITE_AND_INVENTORY --connection=local | grep -q 'changed=2.*failed=0' && (echo 'Idempotence test: pass' && exit 0) || (echo 'Idempotence test: fail' && exit 1) - > ruby -v | grep -q 'ruby' - && (echo 'Version test: pass' && exit 0) - || (echo 'Version test: fail' && exit 1) - - "__rvm_unload ; sudo rm -rf /usr/local/rvm ; sudo rm /etc/profile.d/rvm.sh" - - "ansible-playbook $SITE_HOME_AND_INVENTORY --syntax-check" - - "ansible-playbook $SITE_HOME_AND_INVENTORY --connection=local -vvvv" - - > - ansible-playbook $SITE_HOME_AND_INVENTORY --connection=local - | grep -q 'changed=2.*failed=0' - && (echo 'Idempotence test: pass' && exit 0) - || (echo 'Idempotence test: fail' && exit 1) - - > - ruby -v - | grep -q 'ruby' - && (echo 'Version test: pass' && exit 0) - || (echo 'Version test: fail' && exit 1) \ No newline at end of file + && (echo 'Yes ruby test: pass' && exit 0) + || (echo 'Yes ruby test: fail' && exit 1) \ No newline at end of file diff --git a/tests/test_system.yml b/tests/test.yml similarity index 100% rename from tests/test_system.yml rename to tests/test.yml diff --git a/tests/test_home.yml b/tests/test_home.yml deleted file mode 100644 index 27afeb8..0000000 --- a/tests/test_home.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- hosts: localhost - remote_user: travis - sudo: true - vars: - ruby_temp_download_path: /tmp - ruby_rvm_install_path: ~/.rvm - - roles: - - ansible-ruby \ No newline at end of file