From 603df4fd6dafcb5561867808c2ab87b9a6ab3e33 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Thu, 12 Nov 2015 12:11:22 -0800 Subject: [PATCH] Revert "Add magnum support to functional tests on shade" 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 9cf8601417c74714fd7e56ee68ff4723f5933731. Change-Id: I9c887ceb2585fb092dce3e400758b6dc9f32acde --- jenkins/jobs/shade.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/jenkins/jobs/shade.yaml b/jenkins/jobs/shade.yaml index 670434c4e8..77ea453183 100644 --- a/jenkins/jobs/shade.yaml +++ b/jenkins/jobs/shade.yaml @@ -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