From c035211cda5dce75e8a162a713ec751088bef7e7 Mon Sep 17 00:00:00 2001 From: James Li Date: Wed, 16 Jul 2014 16:25:32 +0000 Subject: [PATCH] Added a call to gate_hook in solum. Change-Id: I1b9704ae912595aab2e6e8aa4f74c9cfb54f2ab9 --- .../files/jenkins_job_builder/config/solum.yaml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml b/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml index b8ff4842f6..ab5b75b1be 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml @@ -16,7 +16,6 @@ export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_NEUTRON=1 - export KEEP_LOCALRC=1 export ENABLED_SERVICES=solum,solum-api,solum-build-api,solum-conductor,solum-deployer,solum-worker,tempest export PROJECTS="stackforge/solum $PROJECTS" @@ -26,6 +25,12 @@ } export -f pre_test_hook + function gate_hook { + cd /opt/stack/new/solum/functionaltests + ./gate_hook.sh + } + export -f gate_hook + function post_test_hook { cd /opt/stack/new/solum/functionaltests ./post_test_hook.sh @@ -57,7 +62,6 @@ export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TIMEOUT=60 export DEVSTACK_GATE_NEUTRON=1 - export KEEP_LOCALRC=1 export ENABLED_SERVICES=solum,solum-api,solum-build-api,solum-conductor,solum-deployer,solum-worker,tempest export PROJECTS="stackforge/solum $PROJECTS" @@ -67,6 +71,12 @@ } export -f pre_test_hook + function gate_hook { + cd /opt/stack/new/solum/functionaltests + ./gate_hook.sh + } + export -f gate_hook + function post_test_hook { cd /opt/stack/new/solum/functionaltests ./post_test_hook.sh