openstack/project-config
Code Issues Proposed changes

Fix Tempest jobs for Manila project

Browse Source 
Change [1] started to use comments in multiline command,
and it was done with wrong separation of comments and arguments.
So, arguments are not provided correctly to the devstack hook scripts
and they behave as nothing was provided, after their work finished we
get errors when bash tries to execute 'arguments' as separate commands.

So, fix usage of comments separating them from multiline command.

[1] I521f0419e65e27f22acbc03aaa1f0f997492e8f8

Change-Id: I5c073d38b61b21ec642ee11a28e6b23fe5662159
This commit is contained in:
vponomaryov 2015-12-30 13:32:41 +02:00
parent 73b37edc1c
commit 6ae99cee70
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
jenkins/jobs/manila.yaml
View File

@ -31,29 +31,32 @@
export KEEP_LOCALRC=1
function pre_test_hook {{
# 'dhss' - acronym for 'Driver Handles Share Servers',
# defines mode of a share driver. Boolean-like.
# 'driver' - codename of a share driver to configure.
# 'back_end_type' - defines which installation Manila should
# have - either 'singlebackend' or 'multibackend'.
source $BASE/new/manila/contrib/ci/pre_test_hook.sh \
# Variable 'dhss' means 'driver handles share servers',
# boolean-like.
{dhss} \
# Driver codename for configuring specific share driver
{driver} \
# Configure Manila for work in 'singlebackend' or
# 'multibackend' mode.
{back_end_type}
}}
export -f pre_test_hook
function post_test_hook {{
# 'back_end_type' - defines which installation Manila is
# configured to - either 'singlebackend' or 'multibackend'.
# 'driver' - codename of a share driver that is configured in
# Manila. It is used for enabling/disabling tests that are not
# supported by share driver that is used.
# 'test_type' - defines which set of test suites should be used,
# can have 'api' and 'scenario' values.
# 'postgres_enabled' - set of test suites depends on DB backend
# in some cases, so it is provided explicitely. Boolean-like.
source $BASE/new/manila/contrib/ci/post_test_hook.sh \
# Configure and run tempest on 'singlebackend' or
# 'multibackend' manila installation.
{back_end_type} \
# Set of test suites can differ based on used share driver
{driver} \
# 'test_type' can have values as 'api' and 'scenario'
# that is used for running of appropriate test suites.
{test_type} \
# Set of test suites can differ depending of DB back-end
{postgres_enabled}
}}
export -f post_test_hook