From fb8a3a9686ff02c8579f94e37ed9ee54b2d66fc6 Mon Sep 17 00:00:00 2001 From: Kiall Mac Innes Date: Fri, 27 Nov 2015 16:38:59 +0000 Subject: [PATCH] Switch Designate DSVM jobs to use a DevStack Plugin Change-Id: I5f859408069789e1900546b57037e6994721e684 Depends-On: I23ef00bb136e92abc5e69a9bbe1093cad9d2a362 --- jenkins/jobs/designate.yaml | 102 +++++++++++++++++++++++++----------- 1 file changed, 72 insertions(+), 30 deletions(-) diff --git a/jenkins/jobs/designate.yaml b/jenkins/jobs/designate.yaml index 60f97c718e..71f7df48e4 100644 --- a/jenkins/jobs/designate.yaml +++ b/jenkins/jobs/designate.yaml @@ -24,23 +24,44 @@ export PROJECTS="openstack/python-designateclient $PROJECTS" export PROJECTS="openstack/designate-dashboard $PROJECTS" - function gate_hook {{ - cd /opt/stack/new/designate/contrib/devstack - ./gate_hook.sh - }} - export -f gate_hook + if [[ "stable/juno stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then + # Juno/Kilo/Liberty version uses the older 'hooks' approach to adding + # the Designate plugin - function pre_test_hook {{ - cd /opt/stack/new/designate/contrib/devstack - ./pre_test_hook.sh - }} - export -f pre_test_hook + function gate_hook {{ + cd /opt/stack/new/designate/contrib/devstack + ./gate_hook.sh + }} + export -f gate_hook - function post_test_hook {{ - cd /opt/stack/new/designate/contrib/devstack - ./post_test_hook.sh - }} - export -f post_test_hook + function pre_test_hook {{ + 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 + + else + # Otherwise, enable the Designate devstack plugin. + export DEVSTACK_LOCAL_CONFIG="enable_plugin designate git://git.openstack.org/openstack/designate" + + function gate_hook {{ + cd /opt/stack/new/designate/devstack/gate + ./gate_hook.sh + }} + export -f gate_hook + + function post_test_hook {{ + cd /opt/stack/new/designate/devstack/gate + ./post_test_hook.sh + }} + export -f post_test_hook + fi cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh @@ -77,23 +98,44 @@ export PROJECTS="openstack/python-designateclient $PROJECTS" export PROJECTS="openstack/designate-dashboard $PROJECTS" - function gate_hook {{ - cd /opt/stack/new/designate/contrib/devstack - ./gate_hook.sh - }} - export -f gate_hook + if [[ "stable/juno stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then + # Juno/Kilo/Liberty version uses the older 'hooks' approach to adding + # the Designate plugin - function pre_test_hook {{ - cd /opt/stack/new/designate/contrib/devstack - ./pre_test_hook.sh - }} - export -f pre_test_hook + function gate_hook {{ + cd /opt/stack/new/designate/contrib/devstack + ./gate_hook.sh + }} + export -f gate_hook - function post_test_hook {{ - cd /opt/stack/new/designate/contrib/devstack - ./post_test_hook.sh - }} - export -f post_test_hook + function pre_test_hook {{ + 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 + + else + # Otherwise, enable the Designate devstack plugin. + export DEVSTACK_LOCAL_CONFIG="enable_plugin designate git://git.openstack.org/openstack/designate" + + function gate_hook {{ + cd /opt/stack/new/designate/devstack/gate + ./gate_hook.sh + }} + export -f gate_hook + + function post_test_hook {{ + cd /opt/stack/new/designate/devstack/gate + ./post_test_hook.sh + }} + export -f post_test_hook + fi cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh