Merge "Update ansible test job to run against stable-2.5"

.zuul.yaml

@@ -203,6 +203,27 @@
       test_matrix_branch: master
       tox_install_siblings: true
 
+- job:
+    name: shade-ansible-stable-2.5-functional-devstack
+    parent: shade-ansible-functional-devstack
+    description: |
+      Run shade ansible functional tests against a master devstack
+      using git devel branch version of ansible.
+    branches: ^(devel|master)$
+    required-projects:
+      - name: github.com/ansible/ansible
+        override-checkout: stable-2.5
+      - name: openstack-infra/shade
+        override-checkout: master
+      - name: openstack-dev/devstack
+        override-checkout: master
+    vars:
+      # test-matrix grabs branch from the zuul branch setting. If the job
+      # is triggered by ansible, that branch will be stable-2.5 which doesn't
+      # make sense to devstack. Override so that we run the right thing.
+      test_matrix_branch: master
+      tox_install_siblings: true
+
 - project-template:
     name: shade-functional-tips
     check:
@@ -224,7 +245,7 @@
       jobs:
         - bifrost-integration-tinyipa
         - bifrost-integration-tinyipa-opensuse-423
-        - shade-ansible-devel-functional-devstack:
+        - shade-ansible-stable-2.5-functional-devstack:
             voting: false
         - shade-ansible-functional-devstack
         - shade-functional-devstack

tox.ini

@@ -63,7 +63,7 @@ deps =
     -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
-    ansible
+    ansible<=2.5
 commands = {toxinidir}/extras/run-ansible-tests.sh -e {envdir} {posargs}
 
 [testenv:docs]