Limit target projects for the neutron func job

The neutron functional job does not rely on repositories other than
devstack and neutron, so limit the projects that devstack-gate updates
in the workspace accordingly.

This change also reverts the changes to the neutron api job that
validated that the functional job could safely run with a restricted
set of projects.

Change-Id: Ic59c3b2cc5d0b40a8f05c2d89eb1cf5e9e2f0d1d
This commit is contained in:
Maru Newby 2015-02-14 05:32:25 +00:00
parent e0f2673560
commit e06c180c1d
2 changed files with 6 additions and 3 deletions

View File

@ -21,19 +21,18 @@
export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_INSTALL_TESTONLY=1 export DEVSTACK_GATE_INSTALL_TESTONLY=1
export DEVSTACK_GATE_TESTR_ARTIFACT_TARGET=neutron export DEVSTACK_GATE_TESTR_ARTIFACT_TARGET=neutron
export DEVSTACK_GATE_PROJECTS_OVERRIDE="openstack-dev/devstack openstack/neutron"
export BRANCH_OVERRIDE={branch-override} export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi fi
function gate_hook {{ function gate_hook {{
bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh dsvm-functional bash -xe $BASE/new/neutron/neutron/tests/contrib/gate_hook.sh api
}} }}
export -f gate_hook export -f gate_hook
function post_test_hook {{ function post_test_hook {{
bash -xe $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh dsvm-functional bash -xe $BASE/new/neutron/neutron/tests/contrib/post_test_hook.sh api
}} }}
export -f post_test_hook export -f post_test_hook

View File

@ -22,6 +22,10 @@
export DEVSTACK_GATE_INSTALL_TESTONLY=1 export DEVSTACK_GATE_INSTALL_TESTONLY=1
export BRANCH_OVERRIDE={branch-override} export BRANCH_OVERRIDE={branch-override}
export DEVSTACK_GATE_TESTR_ARTIFACT_TARGET=neutron export DEVSTACK_GATE_TESTR_ARTIFACT_TARGET=neutron
# Gate hooks previous to kilo will break if PROJECTS is overridden
if [[ ! "$BRANCH_OVERRIDE" =~ ^stable/(icehouse|juno)$ ]]; then
export DEVSTACK_GATE_PROJECTS_OVERRIDE="openstack-dev/devstack openstack/neutron"
fi
if [ "$BRANCH_OVERRIDE" != "default" ] ; then if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi fi