openstack/project-config
Code Issues Proposed changes

Revert "Add magnum support to functional tests on shade"

Browse Source 
The magnum devstack plugin does not conform to our expectations of
how a project should interact with our CI system.  It downloads
an opaque image from a fedorapeople hosted site.

Instead, it should build an image using our CI system, host it
on tarballs.o.o, and, assuming it is not too large, be cached by
our image builds.

Until it does that, we should not use it in other projects.

This reverts commit 9cf8601417.

Change-Id: I9c887ceb2585fb092dce3e400758b6dc9f32acde
This commit is contained in:
James E. Blair 2015-11-12 12:11:22 -08:00
parent 6c3af2c5dd
commit 603df4fd6d
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