openstack/project-config
Code Issues Proposed changes

Add tempest job to dragonflow

Browse Source 
Align the tests for dragonflow

Change-Id: I5593ea4185f589f531df7a943637f34186a315b7
This commit is contained in:
Gal Sagie 2015-08-29 17:28:51 +03:00
parent b2b5cc365e
commit 7ae4c2bcbf
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jenkins/jobs/dragonflow.yaml
View File

@ -16,13 +16,7 @@
export PYTHONUNBUFFERED=true export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120 export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_TEMPEST=0 export DEVSTACK_GATE_TEMPEST=1
s="rabbit,mysql,key,n-cpu,n-api,n-crt,n-obj,n-cond,n-sch"
s+=",n-cauth,neutron,q-svc,q-df-l3,q-df-agt,q-dhcp,q-meta,cinder"
s+=",g-api,g-reg,c-api,c-vol,c-sch,c-bak"
export OVERRIDE_ENABLED_SERVICES="$s"
export BRANCH_OVERRIDE={branch-override} export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@ -31,14 +25,17 @@
# our project repository. This makes zuul do the right # our project repository. This makes zuul do the right
# reference magic for testing changes. # reference magic for testing changes.
export PROJECTS="openstack/dragonflow $PROJECTS" export PROJECTS="openstack/dragonflow $PROJECTS"
# Note the actual url here is somewhat irrelevant because it
export DEVSTACK_LOCAL_CONFIG="enable_plugin dragonflow https://git.openstack.org/openstack/dragonflow" # caches in nodepool, however make it a valid url for
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ENABLE_DRAGONFLOW=True" # documentation purposes.
export DEVSTACK_LOCAL_CONFIG+=$'\n'"ML2_L3_PLUGIN=dragonflow.neutron.services.l3.l3_controller_plugin.ControllerL3ServicePlugin" export DEVSTACK_LOCAL_CONFIG="enable_plugin dragonflow git://git.openstack.org/openstack/dragonflow"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ENABLE_DRAGONFLOW_LOCAL_CONTROLLER=True"
# Keep localrc to be able to set some vars in pre_test_hook # Keep localrc to be able to set some vars in pre_test_hook
export KEEP_LOCALRC=1 export KEEP_LOCALRC=1
export DEVSTACK_GATE_SETTINGS=/opt/stack/new/dragonflow/devstack/devstackgaterc
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh

2
zuul/layout.yaml
View File

@ -869,7 +869,7 @@ jobs:
voting: false voting: false
- name: ^gate-tempest-dsvm-dragonflow - name: ^gate-tempest-dsvm-dragonflow
branch: ^(?!stable/kilo).*$ branch: ^(?!stable)
voting: false voting: false
- name: ^gate-neutron-fwaas-dsvm-functional$ - name: ^gate-neutron-fwaas-dsvm-functional$