openstack/project-config
Code Issues Proposed changes

Merge "move neutron-api job to use gate hooks"

Browse Source
This commit is contained in:
Jenkins 2015-01-06 18:33:00 +00:00 committed by Gerrit Code Review
commit 4fca1987a9
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jenkins/jobs/neutron-api.yaml
View File

@ -25,21 +25,16 @@
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi fi
function gate_hook {{
bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh api
}}
export -f gate_hook
function post_test_hook {{ function post_test_hook {{
cd $BASE/new/neutron bash -xe $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh api
# Ensure that the executing user can invoke tox on the
# neutron source tree.
sudo chown -R tempest:stack $BASE/new/neutron
echo "Configuring venv for neutron api test suite"
# Manually install tempest pending a decision on how
# best to include tempest as an explicit test dependency
# of neutron.
sudo -H -u tempest tox -e api --notest
sudo -H -u tempest .tox/api/bin/pip install $BASE/new/tempest
echo "Running neutron api test suite"
sudo -H -u tempest tox -e api
}} }}
export -f post_test_hook export -f post_test_hook
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh

4
jenkins/jobs/neutron-functional.yaml
View File

@ -26,12 +26,12 @@
fi fi
function gate_hook {{ function gate_hook {{
bash -xe $BASE/new/neutron/neutron/tests/functional/contrib/gate_hook.sh bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh dsvm-functional
}} }}
export -f gate_hook export -f gate_hook
function post_test_hook {{ function post_test_hook {{
bash -xe $BASE/new/neutron/neutron/tests/functional/contrib/post_test_hook.sh bash -xe $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh dsvm-functional
}} }}
export -f post_test_hook export -f post_test_hook