openstack/project-config
Code Issues Proposed changes

Add magnum support to functional tests on shade

Browse Source 
Enable magnum plugin, so we can start adding magnum functionality
and tests for it.
Also increasing timeout, as magnum tests can cause more overhead.

Change-Id: I6e400584202d2d8dbfbd864e2f1941b7a2dc74ce
This commit is contained in:
Yolanda Robla 2015-11-07 11:51:27 +01:00
parent 2a56c628f2
commit 9cf8601417
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jenkins/jobs/shade.yaml
View File

@ -4,7 +4,7 @@
wrappers:
- build-timeout:
timeout: 65
timeout: 125
- timestamps
builders:
@ -15,9 +15,10 @@
#!/bin/bash -xe
export SHADE_USE_KEYSTONE_V2=1
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=60
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_NEUTRON=1
export PROJECTS="openstack-infra/shade $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin magnum git://git.openstack.org/openstack/magnum"
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@ -40,7 +41,7 @@
wrappers:
- build-timeout:
timeout: 65
timeout: 125
- timestamps
builders:
@ -50,9 +51,10 @@
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=60
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_NEUTRON=1
export PROJECTS="openstack-infra/shade $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin magnum git://git.openstack.org/openstack/magnum"
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE