opendev/system-config
Code Issues Proposed changes

Fixed config of manila's jobs

Browse Source 
Env vars from separate script were exported only
for child process and were not available for other subprocesses.
https://jenkins07.openstack.org/job/gate-manila-tempest-dsvm-neutron/122/console

Set all external scripts to be called in parent process.
Because there is no need to use subprocesses.

Call of setup.sh is intended to be in pre_test_hook:
https://review.openstack.org/#/c/97003/

Also added 'export DEVSTACK_GATE_NEUTRON=1' to the config,
because name of job supposes using of neutron, so enable it
by default.

Change-Id: Ia211526d63c172b5c9f700d59c143ad78694348b
This commit is contained in:
Valeriy Ponomaryov 2014-05-31 11:40:55 +03:00
parent ec6d94fd6b
commit 2ecb4c5aa2
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/openstack_project/files/jenkins_job_builder/config/manila.yaml
View File

@ -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