openstack
/
project-config
Code Issues Proposed changes

Revert "Disable devstack plugin for builder 'ironic-grenade'" 

This reverts commit d6a054376d.

This commit caused bug 1642362, by changing when extra-vars were
read, which in some cases caused the ironic-inspector devstack plugin
to be enabled in local.conf before the ironic plugin, causing failures.

Change-Id: I9a19d7ddaa982b692b4fd678e823f742bfa4bd03
Closes-bug: #1642362
This commit is contained in:
Jay Faulkner 2016-11-16 11:11:07 -08:00
parent 9cf36d9a72
commit a2b9f50d12
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jenkins/jobs/ironic.yaml
View File

@ -17,10 +17,6 @@
export DEVSTACK_GATE_TEMPEST_BAREMETAL_BUILD_TIMEOUT=1200
export GRENADE_PLUGINRC="enable_grenade_plugin ironic https://git.openstack.org/openstack/ironic"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_BUILD_DEPLOY_RAMDISK=False"
# NOTE(jlvillal): export not needed for this as used within devstack-virtual-ironic
# We disable the devstack plugin because the grenade code in Ironic
# enables it and enabling it twice causes errors.
IRONIC_DISABLE_DEVSTACK_PLUGIN=1
- builder:
name: ironic-client-from-source
@ -227,16 +223,16 @@
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS=/opt/stack/new/ironic"
fi
# devstack plugin didn't exist until mitaka
if [[ "$ZUUL_BRANCH" != "stable/liberty" ]] ; then
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic"
fi
# Ensure the ironic-extra-vars file exists
touch ironic-extra-vars
# Pull in the extra variables injected by the optional builders
source ironic-extra-vars
# devstack plugin didn't exist until mitaka
if [[ -z "$IRONIC_DISABLE_DEVSTACK_PLUGIN" && "$ZUUL_BRANCH" != "stable/liberty" ]] ; then
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic"
fi
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh