openstack/project-config
Code Issues Proposed changes

networking-odl: adopt DEVSTACK_GATE_SETTINGS

Browse Source 
Make use of DEVSTACK_GATE_SETTINGS and remove unnecessary
OVERRIDE_ENABLED_SERVICES which is defined in devstackgaterc.

Change-Id: I8f573cd52f559847daa15f267435f4dfea19bfad
This commit is contained in:
Isaku Yamahata 2016-11-07 10:08:00 -08:00
parent fc7ed604f6
commit 8dbc3f42f1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jenkins/jobs/networking-odl.yaml
View File

@ -55,6 +55,7 @@
}} }}
export -f post_test_hook export -f post_test_hook
export DEVSTACK_GATE_SETTINGS=/opt/stack/new/networking-odl/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
@ -90,8 +91,6 @@
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-odl git://git.openstack.org/openstack/networking-odl" export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-odl git://git.openstack.org/openstack/networking-odl"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin rally git://git.openstack.org/openstack/rally" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin rally git://git.openstack.org/openstack/rally"
export OVERRIDE_ENABLED_SERVICES=q-svc,q-dhcp,q-meta,quantum,n-api,n-cond,n-cpu,n-crt,n-sch,g-api,g-reg,mysql,rabbit,key,dstat
# 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
@ -108,6 +107,7 @@
}} }}
export -f post_test_hook export -f post_test_hook
export DEVSTACK_GATE_SETTINGS=/opt/stack/new/networking-odl/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
@ -145,6 +145,7 @@
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi fi
export DEVSTACK_GATE_SETTINGS=/opt/stack/new/networking-odl/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
@ -211,9 +212,10 @@
export DEVSTACK_GATE_TOPOLOGY="multinode" export DEVSTACK_GATE_TOPOLOGY="multinode"
export DEVSTACK_GATE_SETTINGS=/opt/stack/new/networking-odl/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
publishers: publishers:
- devstack-logs - devstack-logs
- console-log - console-log