Merge "Fixed config of manila's jobs"
This commit is contained in:
commit
aac34ce01b
@ -16,19 +16,18 @@
|
|||||||
#!/bin/bash -xe
|
#!/bin/bash -xe
|
||||||
export PYTHONUNBUFFERED=true
|
export PYTHONUNBUFFERED=true
|
||||||
export DEVSTACK_GATE_TIMEOUT=60
|
export DEVSTACK_GATE_TIMEOUT=60
|
||||||
|
export DEVSTACK_GATE_NEUTRON=1
|
||||||
export ENABLED_SERVICES=manila,m-api,m-shr,m-sch,tempest
|
export ENABLED_SERVICES=manila,m-api,m-shr,m-sch,tempest
|
||||||
export PROJECTS="stackforge/manila $PROJECTS"
|
export PROJECTS="stackforge/manila $PROJECTS"
|
||||||
export PROJECTS="stackforge/python-manilaclient $PROJECTS"
|
export PROJECTS="stackforge/python-manilaclient $PROJECTS"
|
||||||
|
|
||||||
function pre_test_hook {
|
function pre_test_hook {
|
||||||
# Run setup script with exports of env vars
|
source $BASE/new/manila/contrib/ci/pre_test_hook.sh
|
||||||
$BASE/new/manila/contrib/ci/setup.sh
|
|
||||||
$BASE/new/manila/contrib/ci/pre_test_hook.sh
|
|
||||||
}
|
}
|
||||||
export -f pre_test_hook
|
export -f pre_test_hook
|
||||||
|
|
||||||
function post_test_hook {
|
function post_test_hook {
|
||||||
$BASE/new/manila/contrib/ci/post_test_hook.sh
|
source $BASE/new/manila/contrib/ci/post_test_hook.sh
|
||||||
}
|
}
|
||||||
export -f post_test_hook
|
export -f post_test_hook
|
||||||
|
|
||||||
@ -58,19 +57,18 @@
|
|||||||
#!/bin/bash -xe
|
#!/bin/bash -xe
|
||||||
export PYTHONUNBUFFERED=true
|
export PYTHONUNBUFFERED=true
|
||||||
export DEVSTACK_GATE_TIMEOUT=60
|
export DEVSTACK_GATE_TIMEOUT=60
|
||||||
|
export DEVSTACK_GATE_NEUTRON=1
|
||||||
export ENABLED_SERVICES=manila,m-api,m-shr,m-sch,tempest
|
export ENABLED_SERVICES=manila,m-api,m-shr,m-sch,tempest
|
||||||
export PROJECTS="stackforge/manila $PROJECTS"
|
export PROJECTS="stackforge/manila $PROJECTS"
|
||||||
export PROJECTS="stackforge/python-manilaclient $PROJECTS"
|
export PROJECTS="stackforge/python-manilaclient $PROJECTS"
|
||||||
|
|
||||||
function pre_test_hook {
|
function pre_test_hook {
|
||||||
# Run setup script with exports of env vars
|
source $BASE/new/manila/contrib/ci/multi_backend/pre_test_hook.sh
|
||||||
$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
|
export -f pre_test_hook
|
||||||
|
|
||||||
function post_test_hook {
|
function post_test_hook {
|
||||||
$BASE/new/manila/contrib/ci/multi_backend/post_test_hook.sh
|
source $BASE/new/manila/contrib/ci/multi_backend/post_test_hook.sh
|
||||||
}
|
}
|
||||||
export -f post_test_hook
|
export -f post_test_hook
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user