diff --git a/jenkins/jobs/aodh.yaml b/jenkins/jobs/aodh.yaml index 4ed7d07e66..86dbd059f8 100644 --- a/jenkins/jobs/aodh.yaml +++ b/jenkins/jobs/aodh.yaml @@ -57,6 +57,7 @@ export DEVSTACK_GATE_TEMPEST_REGEX="^aodh\." export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 export PROJECTS="openstack/aodh $PROJECTS" + export AODH_BACKEND={backend} export DEVSTACK_LOCAL_CONFIG="enable_plugin aodh git://git.openstack.org/openstack/aodh" if [ "{backend}" = "postgresql" ] ; then export DEVSTACK_GATE_POSTGRES=1 @@ -64,19 +65,6 @@ if [ "x{network}" = "x-neutron" ] ; then export DEVSTACK_GATE_NEUTRON=1 fi - - function gate_hook {{ - cd /opt/stack/new/aodh/devstack/gate - ./gate_hook.sh {backend} - }} - export -f gate_hook - - function post_test_hook {{ - cd /opt/stack/new/aodh/aodh/tests/functional/hooks - ./post_test_hook.sh {backend} - }} - 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