openstack/project-config
Code Issues Proposed changes

Integrate ansible-dev-magnum with real job in shade

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

Change-Id: I8e71a7d79697385010ee1c58ce1f3c13d0b9051f
This commit is contained in:
Yolanda Robla
2016-05-12 10:17:00 +02:00
parent c3e1277808
commit f050c2c0fb
2 changed files with 6 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
jenkins/jobs/shade.yaml
View File

@@ -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

4
zuul/layout.yaml
View File

@@ -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