openstack
/
project-config
Code Issues Proposed changes

Merge "Run neutron multinode without dvr"

This commit is contained in:
Jenkins 2015-07-07 10:06:28 +00:00 committed by Gerrit Code Review
parent bc9a670f93 46eec36dbd
commit 173dc753d5
3 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
jenkins/jobs/devstack-gate.yaml
View File

@ -1883,6 +1883,44 @@
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_CONFIGDRIVE=0
export DEVSTACK_GATE_TEMPEST_FULL=1
# Default to non DVR
export DEVSTACK_GATE_NEUTRON_DVR=0
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
export DEVSTACK_GATE_TOPOLOGY="multinode"
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh
publishers:
- devstack-logs
- console-log
- job-template:
name: '{pipeline}-tempest-dsvm-neutron-dvr-multinode-full{branch-designator}'
node: '{node}'
wrappers:
- build-timeout:
timeout: 125
- timestamps
builders:
- link-logs
- net-info
- devstack-checkout
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_CONFIGDRIVE=0
export DEVSTACK_GATE_TEMPEST_FULL=1
# Test DVR works multinode
export DEVSTACK_GATE_NEUTRON_DVR=1
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then

5
jenkins/jobs/projects.yaml
View File

@ -2956,6 +2956,11 @@
node: devstack-trusty-2-node
branch-designator: ''
branch-override: default
- '{pipeline}-tempest-dsvm-neutron-dvr-multinode-full{branch-designator}':
pipeline: check
node: devstack-trusty-2-node
branch-designator: ''
branch-override: default
- '{pipeline}-tempest-dsvm-multinode-smoke{branch-designator}':
pipeline: check
node: devstack-trusty-2-node

9
zuul/layout.yaml
View File

@ -787,6 +787,10 @@ jobs:
branch: ^(?!stable/juno).*$
voting: false
- name: check-tempest-dsvm-neutron-dvr-multinode-full
branch: ^(?!stable/juno).*$
voting: false
- name: check-tempest-dsvm-multinode-smoke
branch: ^(?!stable/juno).*$
voting: false
@ -2272,6 +2276,7 @@ projects:
- neutron-coverage
experimental:
- check-tempest-dsvm-neutron-multinode-full
- check-tempest-dsvm-neutron-dvr-multinode-full
- gate-grenade-dsvm-neutron-forward
- check-tempest-dsvm-neutron-linuxbridge
- check-grenade-dsvm-neutron-sideways
@ -2375,6 +2380,7 @@ projects:
- gate-nova-pip-missing-reqs
- check-tempest-dsvm-nova-wsgi-full
- check-tempest-dsvm-neutron-multinode-full
- check-tempest-dsvm-neutron-dvr-multinode-full
- experimental-nova-dsvm-python27
- check-tempest-dsvm-f21
@ -4293,6 +4299,7 @@ projects:
- check-tempest-dsvm-multinode-full
- check-tempest-dsvm-multinode-smoke
- check-tempest-dsvm-neutron-multinode-full
- check-tempest-dsvm-neutron-dvr-multinode-full
- check-tempest-dsvm-neutron-multinode-smoke
- gate-grenade-dsvm-forward
- check-tempest-dsvm-cells
@ -4592,6 +4599,7 @@ projects:
- check-neutron-dsvm-functional
- check-tempest-dsvm-multinode-full
- check-tempest-dsvm-neutron-multinode-full
- check-tempest-dsvm-neutron-dvr-multinode-full
- check-tempest-dsvm-neutron-identity-v3-only-full
- check-tempest-dsvm-cells
- check-tempest-dsvm-mongodb-zaqar
@ -4809,6 +4817,7 @@ projects:
- check-tempest-dsvm-multinode-full
- check-tempest-dsvm-multinode-smoke
- check-tempest-dsvm-neutron-multinode-full
- check-tempest-dsvm-neutron-dvr-multinode-full
- check-tempest-dsvm-neutron-multinode-smoke
- check-grenade-dsvm-neutron-sideways