openstack/project-config
Code Issues Proposed changes

Merge "Revert "Add magnum support to functional tests on shade""

Browse Source
This commit is contained in:
Jenkins 2015-11-12 20:31:19 +00:00 committed by Gerrit Code Review
commit 0a91c30c68
1 changed files with 4 additions and 6 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: 125
timeout: 65
- timestamps
builders:
@ -15,10 +15,9 @@
#!/bin/bash -xe
export SHADE_USE_KEYSTONE_V2=1
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_TIMEOUT=60
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
@ -41,7 +40,7 @@
wrappers:
- build-timeout:
timeout: 125
timeout: 65
- timestamps
builders:
@ -51,10 +50,9 @@
- shell: |
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_TIMEOUT=60
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