From a7fffccae1293a596022bd189655588b2522a2ff Mon Sep 17 00:00:00 2001 From: Pablo Andres Fuente Date: Fri, 27 Jun 2014 17:16:13 -0300 Subject: [PATCH] Moved Tempest regex outside pre_test_hook Moved the tempest regex outside the pre_test_hook in order to get correctly exported. Change-Id: Iaa7bcededba71d76d3145f03f1b088b757975d4c --- .../files/jenkins_job_builder/config/blazar.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/blazar.yaml b/modules/openstack_project/files/jenkins_job_builder/config/blazar.yaml index 1d940222ad..24b5538e88 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/blazar.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/blazar.yaml @@ -22,6 +22,11 @@ export PROJECTS="stackforge/blazar-nova $PROJECTS" export PROJECTS="stackforge/python-blazarclient $PROJECTS" + # Construct a regex to limiting scope of tempest + r="^(?:tempest\.cli\.simple_read_only\.test_resource_.*)" + r="$r|^(?:tempest\.scenario\.test_resource_.*)" + export DEVSTACK_GATE_TEMPEST_REGEX="$r" + function pre_test_hook { # Install blazar devstack integration BLAZAR_BASE=/opt/stack/new/blazar @@ -35,11 +40,6 @@ BLAZAR_TEMPEST_DIR=$BLAZAR_BASE/contrib/tempest TEMPEST_DIR=${TEMPEST_DIR:-/opt/stack/new/tempest} cp -R $BLAZAR_TEMPEST_DIR/tempest/* $TEMPEST_DIR/tempest - - # Construct a regex to limiting scope of tempest - r="^(?:tempest\.cli\.simple_read_only\.test_resource_.*)" - r="$r|^(?:tempest\.scenario\.test_resource_.*)" - export DEVSTACK_GATE_TEMPEST_REGEX="$r" } export -f pre_test_hook