From 8dbc3f42f13cdea9675faece00425b97f2cee9ff Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Mon, 7 Nov 2016 10:08:00 -0800 Subject: [PATCH] networking-odl: adopt DEVSTACK_GATE_SETTINGS Make use of DEVSTACK_GATE_SETTINGS and remove unnecessary OVERRIDE_ENABLED_SERVICES which is defined in devstackgaterc. Change-Id: I8f573cd52f559847daa15f267435f4dfea19bfad --- jenkins/jobs/networking-odl.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/jenkins/jobs/networking-odl.yaml b/jenkins/jobs/networking-odl.yaml index 46e9c0146b..587ec9b6ae 100644 --- a/jenkins/jobs/networking-odl.yaml +++ b/jenkins/jobs/networking-odl.yaml @@ -55,6 +55,7 @@ }} 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 ./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+=$'\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 export KEEP_LOCALRC=1 @@ -108,6 +107,7 @@ }} 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 ./safe-devstack-vm-gate-wrap.sh @@ -145,6 +145,7 @@ export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE 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 ./safe-devstack-vm-gate-wrap.sh @@ -211,9 +212,10 @@ 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 ./safe-devstack-vm-gate-wrap.sh publishers: - devstack-logs - - console-log \ No newline at end of file + - console-log