From a512e3c9c3e825a4745b3273b38918b6669cf0e8 Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Tue, 5 May 2015 23:37:15 +0200 Subject: [PATCH] Extend Zaqar's gate jobs This patch extends zaqar's jobs so that they use the various hooks correctly and allow for other scripts to be maintained by the zaqar team itself. Summary: - Add support for external gate_hook - Add support for external post_gate_hook Change-Id: Ia72e6b2bf66005728bacc4ed850a9aa16c6519a2 --- jenkins/jobs/zaqar.yaml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/jenkins/jobs/zaqar.yaml b/jenkins/jobs/zaqar.yaml index c20a895fc1..961634430e 100644 --- a/jenkins/jobs/zaqar.yaml +++ b/jenkins/jobs/zaqar.yaml @@ -61,25 +61,29 @@ #!/bin/bash -xe export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TIMEOUT=120 - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_ZAQAR=1 - export DEVSTACK_GATE_ZAQAR_BACKEND={backend} export BRANCH_OVERRIDE={branch-override} - export ENABLED_SERVICES=mysql,key export DEVSTACK_LOCAL_CONFIG="enable_plugin zaqar git://git.openstack.org/openstack/zaqar" if [ "$BRANCH_OVERRIDE" != "default" ] ; then export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE fi - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh + function gate_hook {{ + cd /opt/stack/new/zaqar/devstack/gate + ./gate_hook.sh {backend} + }} + export -f gate_hook function post_test_hook {{ - gzip -9 -c /var/log/zaqar/queues.log > $WORKSPACE/logs/queues.log.txt.gz + cd /opt/stack/new/zaqar/devstack/gate + ./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 + publishers: + - test-results - devstack-logs - console-log