openstack
/
neutron-lbaas
Code Issues Proposed changes

Merge "More zuul v3 updates" into stable/pike

This commit is contained in:
Zuul 2017-11-11 01:33:09 +00:00 committed by Gerrit Code Review
parent f0b6a85877 5be8d3f31a
commit 81cf553215
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/tox_install.sh
View File

@ -17,6 +17,7 @@ ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner
BRANCH_NAME=stable/pike
neutron_installed=$(echo "import neutron" | python 2>/dev/null ; echo $?)
NEUTRON_DIR=$HOME/neutron
local ZUULV3_PROJECT_DIR=$HOME/src/git.openstack.org/openstack/$project
set -e
set -x
@ -31,7 +32,10 @@ shift
# Note that the functional tests use sudo to run tox and thus
# variables used for zuul-cloner to check out the correct version are
# lost.
if [ -d "$NEUTRON_DIR" ]; then
if [ -d "$ZUULV3_PROJECT_DIR" ]; then
echo "FOUND Neutron code at $ZUULV3_PROJECT_DIR - using"
$install_cmd -U -e $ZUULV3_PROJECT_DIR
elif [ -d "$NEUTRON_DIR" ]; then
echo "FOUND Neutron code at $NEUTRON_DIR - using"
$install_cmd -U -e $NEUTRON_DIR
elif [ $neutron_installed -eq 0 ]; then

32
zuul.d/jobs.yaml
View File

@ -1,8 +1,8 @@
- job:
name: neutron-lbaasv2-dsvm-api
parent: legacy-dsvm-base
run: playbooks/legacy/neutron-lbaasv2-dsvm-api/run
post-run: playbooks/legacy/neutron-lbaasv2-dsvm-api/post
run: playbooks/legacy/neutron-lbaasv2-dsvm-api/run.yaml
post-run: playbooks/legacy/neutron-lbaasv2-dsvm-api/post.yaml
timeout: 7800
required-projects:
- openstack-infra/devstack-gate
@ -16,8 +16,8 @@
- job:
name: neutron-lbaasv2-dsvm-py3x-api
parent: legacy-dsvm-base
run: playbooks/legacy/neutron-lbaasv2-dsvm-py3x-api/run
post-run: playbooks/legacy/neutron-lbaasv2-dsvm-py3x-api/post
run: playbooks/legacy/neutron-lbaasv2-dsvm-py3x-api/run.yaml
post-run: playbooks/legacy/neutron-lbaasv2-dsvm-py3x-api/post.yaml
timeout: 7800
required-projects:
- openstack-infra/devstack-gate
@ -31,8 +31,8 @@
- job:
name: neutron-lbaasv2-dsvm-api-namespace
parent: legacy-dsvm-base
run: playbooks/legacy/neutron-lbaasv2-dsvm-api-namespace/run
post-run: playbooks/legacy/neutron-lbaasv2-dsvm-api-namespace/post
run: playbooks/legacy/neutron-lbaasv2-dsvm-api-namespace/run.yaml
post-run: playbooks/legacy/neutron-lbaasv2-dsvm-api-namespace/post.yaml
timeout: 7800
required-projects:
- openstack-infra/devstack-gate
@ -46,8 +46,8 @@
- job:
name: neutron-lbaasv2-dsvm-py3x-api-namespace
parent: legacy-dsvm-base
run: playbooks/legacy/neutron-lbaasv2-dsvm-py3x-api-namespace/run
post-run: playbooks/legacy/neutron-lbaasv2-dsvm-py3x-api-namespace/post
run: playbooks/legacy/neutron-lbaasv2-dsvm-py3x-api-namespace/run.yaml
post-run: playbooks/legacy/neutron-lbaasv2-dsvm-py3x-api-namespace/post.yaml
timeout: 7800
required-projects:
- openstack-infra/devstack-gate
@ -61,8 +61,8 @@
- job:
name: neutron-lbaasv2-dsvm-scenario
parent: legacy-dsvm-base
run: playbooks/legacy/neutron-lbaasv2-dsvm-scenario/run
post-run: playbooks/legacy/neutron-lbaasv2-dsvm-scenario/post
run: playbooks/legacy/neutron-lbaasv2-dsvm-scenario/run.yaml
post-run: playbooks/legacy/neutron-lbaasv2-dsvm-scenario/post.yaml
timeout: 7800
required-projects:
- openstack-infra/devstack-gate
@ -76,8 +76,8 @@
- job:
name: neutron-lbaasv2-dsvm-py3x-scenario
parent: legacy-dsvm-base
run: playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario/run
post-run: playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario/post
run: playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario/run.yaml
post-run: playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario/post.yaml
timeout: 7800
required-projects:
- openstack-infra/devstack-gate
@ -91,8 +91,8 @@
- job:
name: neutron-lbaasv2-dsvm-scenario-namespace
parent: legacy-dsvm-base
run: playbooks/legacy/neutron-lbaasv2-dsvm-scenario-namespace/run
post-run: playbooks/legacy/neutron-lbaasv2-dsvm-scenario-namespace/post
run: playbooks/legacy/neutron-lbaasv2-dsvm-scenario-namespace/run.yaml
post-run: playbooks/legacy/neutron-lbaasv2-dsvm-scenario-namespace/post.yaml
timeout: 7800
required-projects:
- openstack-infra/devstack-gate
@ -106,8 +106,8 @@
- job:
name: neutron-lbaasv2-dsvm-py3x-scenario-namespace
parent: legacy-dsvm-base
run: playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario-namespace/run
post-run: playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario-namespace/post
run: playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario-namespace/run.yaml
post-run: playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario-namespace/post.yaml
timeout: 7800
required-projects:
- openstack-infra/devstack-gate