From 1e22ebac8fba0ab5efad96fabad3e587d0997b85 Mon Sep 17 00:00:00 2001 From: Anusha Ramineni Date: Thu, 5 Nov 2015 15:44:56 +0530 Subject: [PATCH] Allow congress jobs use devstack and tempest plugins This commit allows congress jobs to use devstack plugin model and also run tempest plugin tests. Change-Id: If6e6fc73673624d6edcb022bd5983c1b30356970 --- jenkins/jobs/congress.yaml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/jenkins/jobs/congress.yaml b/jenkins/jobs/congress.yaml index 71822ef625..eba9369f69 100644 --- a/jenkins/jobs/congress.yaml +++ b/jenkins/jobs/congress.yaml @@ -18,13 +18,20 @@ ENABLED_SERVICES+=n-api,n-crt,n-obj,n-cpu,n-sch,n-cauth, ENABLED_SERVICES+=horizon,mysql,rabbit,sysstat, ENABLED_SERVICES+=cinder,c-api,c-vol,c-sch,n-cond, - ENABLED_SERVICES+=quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta, - ENABLED_SERVICES+=s-proxy,s-object,s-container,s-account + ENABLED_SERVICES+=neutron,q-svc,q-agt,q-dhcp,q-l3,q-meta, + ENABLED_SERVICES+=s-proxy,s-object,s-container,s-account, + ENABLED_SERVICES+=h-eng, h-api, h-api-cfn, h-api-cw + + DEVSTACK_LOCAL_CONFIG="enable_plugin congress git://git.openstack.org/openstack/congress" + DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" + export ENABLED_SERVICES - export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" + export DEVSTACK_LOCAL_CONFIG export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 + export DEVSTACK_GATE_TEMPEST_REGEX="congress_tempest_tests" export DEVSTACK_GATE_NEUTRON=1 export PROJECTS="openstack/congress $PROJECTS" export PROJECTS="openstack/python-congressclient $PROJECTS" @@ -34,12 +41,6 @@ export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE fi - function pre_test_hook {{ - # Install congress-devstack - cp -r $BASE/new/congress/contrib/devstack/* $BASE/new/devstack/ - }} - export -f pre_test_hook - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh