openstack/project-config
Code Issues Proposed changes

Disable devstack plugin for builder 'ironic-grenade'

Browse Source 
Disable the devstack plugin for items which use the 'ironic-grenade'
builder as the grenade plugin in Ironic already enables the devstack
plugin. If the devstack plugin is enabled twice it gets run twice
which will have it attempting to create the bare-metal VMs twice and
failing.

Change-Id: I75ca21804891b91a928bdafe9146e27eae425f63
This commit is contained in:
John L. Villalovos 2016-11-11 16:33:33 -08:00
parent c8937032b0
commit d6a054376d
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jenkins/jobs/ironic.yaml
View File

@ -17,6 +17,10 @@
export DEVSTACK_GATE_TEMPEST_BAREMETAL_BUILD_TIMEOUT=1200 export DEVSTACK_GATE_TEMPEST_BAREMETAL_BUILD_TIMEOUT=1200
export GRENADE_PLUGINRC="enable_grenade_plugin ironic https://git.openstack.org/openstack/ironic" export GRENADE_PLUGINRC="enable_grenade_plugin ironic https://git.openstack.org/openstack/ironic"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_BUILD_DEPLOY_RAMDISK=False" 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: - builder:
name: ironic-client-from-source name: ironic-client-from-source
@ -223,16 +227,16 @@
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS=/opt/stack/new/ironic" export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS=/opt/stack/new/ironic"
fi 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 # Ensure the ironic-extra-vars file exists
touch ironic-extra-vars touch ironic-extra-vars
# Pull in the extra variables injected by the optional builders # Pull in the extra variables injected by the optional builders
source ironic-extra-vars 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 cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh