From f050c2c0fbc0e78b4b390be8494823e395a246d3 Mon Sep 17 00:00:00 2001
From: Yolanda Robla <yolanda.robla-mota@hp.com>
Date: Thu, 12 May 2016 10:17:00 +0200
Subject: [PATCH] Integrate ansible-dev-magnum with real job in shade

We had this as non-voting and it was passing. Unify the
magnum job in the ansible-dev one.

Change-Id: I8e71a7d79697385010ee1c58ce1f3c13d0b9051f
---
 jenkins/jobs/shade.yaml | 46 ++++++-----------------------------------
 zuul/layout.yaml        |  4 ----
 2 files changed, 6 insertions(+), 44 deletions(-)

diff --git a/jenkins/jobs/shade.yaml b/jenkins/jobs/shade.yaml
index a163592348..1a4ab3db49 100644
--- a/jenkins/jobs/shade.yaml
+++ b/jenkins/jobs/shade.yaml
@@ -183,10 +183,16 @@
           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
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@@ -202,43 +208,3 @@
     publishers:
       - devstack-logs
       - console-log
-
-- job:
-    name: 'gate-shade-dsvm-ansible-dev-magnum'
-    node: ubuntu-trusty
-
-    wrappers:
-      - build-timeout:
-          timeout: 70
-      - timestamps
-
-    builders:
-      - link-logs
-      - net-info
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export SHADE_ANSIBLE_DEV=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
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 87b5fc6202..33a7358cd7 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1729,9 +1729,6 @@ jobs:
   - name: gate-dsvm-nodepool-src-shade
     voting: false
 
-  - name: gate-shade-dsvm-ansible-dev-magnum
-    voting: false
-
   - name: gate-bashate-devstack
     voting: false
 
@@ -4116,7 +4113,6 @@ projects:
       - gate-shade-dsvm-ansible
       - gate-shade-dsvm-ansible-dev-nv
       - gate-dsvm-nodepool-src-shade
-      - gate-shade-dsvm-ansible-dev-magnum
     gate:
       - gate-shade-dsvm-functional-keystone2
       - gate-shade-dsvm-functional-neutron