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