opendev/system-config
Code Issues Proposed changes

Merge "Moved Tempest regex outside pre_test_hook"

Browse Source
This commit is contained in:
Jenkins 2014-06-30 20:59:03 +00:00 committed by Gerrit Code Review
commit 3696ee1fb9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/openstack_project/files/jenkins_job_builder/config/blazar.yaml
View File

@ -21,6 +21,11 @@
export PROJECTS="stackforge/blazar-nova $PROJECTS" export PROJECTS="stackforge/blazar-nova $PROJECTS"
export PROJECTS="stackforge/python-blazarclient $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 { function pre_test_hook {
# Install blazar devstack integration # Install blazar devstack integration
BLAZAR_BASE=/opt/stack/new/blazar BLAZAR_BASE=/opt/stack/new/blazar
@ -34,11 +39,6 @@
BLAZAR_TEMPEST_DIR=$BLAZAR_BASE/contrib/tempest BLAZAR_TEMPEST_DIR=$BLAZAR_BASE/contrib/tempest
TEMPEST_DIR=${TEMPEST_DIR:-/opt/stack/new/tempest} TEMPEST_DIR=${TEMPEST_DIR:-/opt/stack/new/tempest}
cp -R $BLAZAR_TEMPEST_DIR/tempest/* $TEMPEST_DIR/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 export -f pre_test_hook