Merge "Fixed config of manila's jobs"

This commit is contained in:
Jenkins 2014-05-30 22:49:01 +00:00 committed by Gerrit Code Review
commit 95531e89ec

View File

@ -16,12 +16,13 @@
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=60
export BASE="/opt/stack"
# Run setup script with exports of env vars
$BASE/new/manila/contrib/ci/setup.sh
export ENABLED_SERVICES=manila,m-api,m-shr,m-sch,tempest
export PROJECTS="stackforge/manila $PROJECTS"
export PROJECTS="stackforge/python-manilaclient $PROJECTS"
function pre_test_hook {
# Run setup script with exports of env vars
$BASE/new/manila/contrib/ci/setup.sh
$BASE/new/manila/contrib/ci/pre_test_hook.sh
}
export -f pre_test_hook
@ -57,12 +58,13 @@
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=60
export BASE="/opt/stack"
# Run setup script with exports of env vars
$BASE/new/manila/contrib/ci/multi_backend/setup.sh
export ENABLED_SERVICES=manila,m-api,m-shr,m-sch,tempest
export PROJECTS="stackforge/manila $PROJECTS"
export PROJECTS="stackforge/python-manilaclient $PROJECTS"
function pre_test_hook {
# Run setup script with exports of env vars
$BASE/new/manila/contrib/ci/multi_backend/setup.sh
$BASE/new/manila/contrib/ci/multi_backend/pre_test_hook.sh
}
export -f pre_test_hook