Add magnum plugin to keystone2 job in shade

This job was set to experimental and non-voting, and has
been passing successfully. Integrate magnum in real
keystone2 tests on shade.

Change-Id: Ic1fc9d26fc9cfe4d94f444399dff581b8cf6e2fe

jenkins/jobs/shade.yaml

@@ -18,9 +18,14 @@
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_HEAT=1
           export DEVSTACK_LOCAL_CONFIG="enable_plugin designate git://git.openstack.org/openstack/designate"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin magnum git://git.openstack.org/openstack/magnum"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='http://tarballs.openstack.org/magnum/images/fedora-atomic-f23-dib.qcow2'"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-atomic-f23-dib'"
           export PROJECTS="openstack/designate $PROJECTS"
           export PROJECTS="openstack/designate-dashboard $PROJECTS"
           export PROJECTS="openstack/designate-tempest-plugin $PROJECTS"
+          export PROJECTS="openstack/magnum $PROJECTS"
+          export PROJECTS="openstack/python-magnumclient $PROJECTS"
           export PROJECTS="openstack-infra/shade $PROJECTS"
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
@@ -197,46 +202,6 @@
       - devstack-logs
       - console-log
 
-- job:
-    name: 'gate-shade-dsvm-functional-keystone2-magnum'
-    node: ubuntu-trusty
-
-    wrappers:
-      - build-timeout:
-          timeout: 70
-      - timestamps
-
-    builders:
-      - link-logs
-      - net-info
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export SHADE_USE_KEYSTONE_V2=1
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_HEAT=1
-          export PROJECTS="openstack/designate $PROJECTS"
-          export PROJECTS="openstack/designate-dashboard $PROJECTS"
-          export PROJECTS="openstack/designate-tempest-plugin $PROJECTS"
-          export PROJECTS="openstack/magnum $PROJECTS"
-          export PROJECTS="openstack/python-magnumclient $PROJECTS"
-          export PROJECTS="openstack-infra/shade $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin designate git://git.openstack.org/openstack/designate"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin magnum git://git.openstack.org/openstack/magnum"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='http://tarballs.openstack.org/magnum/images/fedora-atomic-f23-dib.qcow2'"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-atomic-f23-dib'"
-
-          function post_test_hook {
-              $BASE/new/shade/shade/tests/functional/hooks/post_test_hook.sh
-          }
-          export -f post_test_hook
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-    publishers:
-      - devstack-logs
-      - console-log
-
 - job:
     name: 'gate-shade-dsvm-functional-neutron-magnum'
     node: ubuntu-trusty
@@ -262,9 +227,6 @@
           export PROJECTS="openstack/python-magnumclient $PROJECTS"
           export PROJECTS="openstack-infra/shade $PROJECTS"
           export DEVSTACK_LOCAL_CONFIG="enable_plugin designate git://git.openstack.org/openstack/designate"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin magnum git://git.openstack.org/openstack/magnum"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL='http://tarballs.openstack.org/magnum/images/fedora-atomic-f23-dib.qcow2'"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_IMAGE_NAME='fedora-atomic-f23-dib'"
 
           function post_test_hook {
               $BASE/new/shade/shade/tests/functional/hooks/post_test_hook.sh

zuul/layout.yaml

@@ -1681,9 +1681,6 @@ jobs:
   - name: gate-dsvm-nodepool-src-shade
     voting: false
 
-  - name: gate-shade-dsvm-functional-keystone2-magnum
-    voting: false
-
   - name: gate-bashate-devstack
     voting: false
 
@@ -4040,7 +4037,6 @@ projects:
       - gate-shade-dsvm-ansible
       - gate-shade-dsvm-ansible-dev-nv
       - gate-dsvm-nodepool-src-shade
-      - gate-shade-dsvm-functional-keystone2-magnum
     gate:
       - gate-shade-dsvm-functional-keystone2
       - gate-shade-dsvm-functional-neutron