opendev/system-config
Code Issues Proposed changes

Moved Tempest regex outside pre_test_hook

Browse Source 
Moved the tempest regex outside the pre_test_hook in order to get
correctly exported.

Change-Id: Iaa7bcededba71d76d3145f03f1b088b757975d4c
This commit is contained in:
Pablo Andres Fuente 2014-06-27 17:16:13 -03:00
parent 1bf0887622
commit a7fffccae1
1 changed files with 5 additions and 5 deletions

10
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