Add devel branches and override-checkout for ansible-devel job

Ansible uses the branch 'devel' for the main branch. Without listing it
in branches, zuul doesn't consider it to be a matching change.

Also, devstack should always come from master, as should shade.

Change-Id: Ie61fc55ff12b0074a82d878e86a47a092e091e7a

.zuul.yaml

@@ -50,7 +50,7 @@
       # sure stable branches of shade never get cloned by other people,
       # since stable branches of shade are, well, not actually things.
       - name: openstack-infra/shade
-        override-branch: master
+        override-checkout: master
       - name: openstack/heat
       - name: openstack/swift
     timeout: 9000
@@ -106,7 +106,7 @@
       tox_environment:
         SHADE_USE_KEYSTONE_V2: 1
         SHADE_HAS_NEUTRON: 0
-    override-branch: stable/newton
+    override-checkout: stable/newton
 
 - job:
     name: shade-functional-devstack
@@ -188,9 +188,14 @@
     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-branch: devel
+        override-checkout: devel
+      - name: openstack-infra/shade
+        override-checkout: master
+      - name: openstack-dev/devstack
+        override-checkout: master
     voting: false
     vars:
       tox_install_siblings: true