From 7e54cf84f4c11130bc22774650985d225c0f3707 Mon Sep 17 00:00:00 2001 From: Kiall Mac Innes Date: Sat, 7 Jun 2014 14:50:32 +0100 Subject: [PATCH] Move designate pre/post dsvm hooks to the designate repo This moves the basic dsvm gate setup from openstack-infra/config to the stackforge/designate tree - allowing us to more easily iterate on changes, while also allowing changes to be gated by the gate-designate-devstack-dsvm job. Change-Id: I3c3e869350ce3ac2cf4941648e7b500f2cba1cd0 --- .../files/jenkins_job_builder/config/designate.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/designate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/designate.yaml index cc9123d1a9..5eccef14ff 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/designate.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/designate.yaml @@ -21,13 +21,17 @@ export PROJECTS="stackforge/python-designateclient $PROJECTS" function pre_test_hook { - # Install designate devstack integration - DESIGNATE_BASE=/opt/stack/new/designate - DEVSTACK_BASE=/opt/stack/new/devstack - cp -R $DESIGNATE_BASE/contrib/devstack/* $DEVSTACK_BASE/ + cd /opt/stack/new/designate/contrib/devstack + ./pre_test_hook.sh } export -f pre_test_hook + function post_test_hook { + cd /opt/stack/new/designate/contrib/devstack + ./post_test_hook.sh + } + export -f post_test_hook + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh