Merge "Bump minimum version of Ansible to 2.2.0.0"

ara/tests/integration/failed.yml

@@ -18,3 +18,5 @@
   tasks:
     - fail:
         msg: "This is a failed playbook"
+      tags:
+        - skip_ansible_lint

requirements.txt

@@ -1,7 +1,7 @@
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 
 jinja2>=2.9
-ansible>=2.1.0.0
+ansible>=2.2.0.0
 Flask<0.13
 Flask-SQLAlchemy
 Flask-Migrate

run_tests.sh

@@ -123,13 +123,10 @@ export ANSIBLE_LIBRARY="ara/plugins/modules"
 export ARA_DATABASE="${DATABASE}"
 
 # Lint
-# failed.yml does not work with lint due to unicode error
-# https://github.com/willthames/ansible-lint/issues/242
-# include_role is excluded because it is only applied on >2.2 later
-for file in $(find ara/tests/integration ! -path '*failed.yml' ! -path '*include_role.yml' -regex '.*.y[a]?ml'); do
+for file in $(find ara/tests/integration -regex '.*.y[a]?ml'); do
     ansible-lint ${file}
 done
-for file in $(find ara/tests/integration -maxdepth 1 ! -path '*include_role.yml' -regex '.*.y[a]?ml'); do
+for file in $(find ara/tests/integration -maxdepth 1 -regex '.*.y[a]?ml'); do
     ansible-playbook --syntax-check ${file}
 done
 
@@ -144,13 +141,9 @@ ansible-playbook -vv ara/tests/integration/failed.yml || true
 ansible-playbook -vv ara/tests/integration/incomplete.yml &
 sleep 5
 kill $!
-# This playbook leverages include_role that landed in 2.2.0.0
-ansible_version=$(pip freeze |grep ansible== |cut -f3 -d =)
-if [[ $(semver_compare "${ansible_version}" ">=" "2.2.0.0") == "True" ]]; then
-    ansible-playbook --syntax-check ara/tests/integration/include_role.yml
-    ansible-lint ara/tests/integration/include_role.yml
-    ansible-playbook -vv ara/tests/integration/include_role.yml
-fi
+
+# Test include role which is a bit special
+ansible-playbook -vv ara/tests/integration/include_role.yml
 
 # Run test commands
 pbid=$(ara playbook list -c ID -f value |head -n1)