openstack
/
project-config
Code Issues Proposed changes

Merge "ironic: Put initial GRENADE_PLUGINRC in ironic-vars-early"

This commit is contained in:
Jenkins 2017-02-26 22:59:55 +00:00 committed by Gerrit Code Review
parent 3f9697f421 0dc86c9c29
commit 14ff0019df
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jenkins/jobs/ironic.yaml
View File

@ -30,6 +30,8 @@
# We disable the devstack plugin because the grenade code in Ironic
# enables it and enabling it twice causes errors.
IRONIC_DISABLE_DEVSTACK_PLUGIN=1
# Set this early so that we don't have to be as careful with builder ordering in jobs.
export GRENADE_PLUGINRC="enable_grenade_plugin ironic https://git.openstack.org/openstack/ironic"
- ironic-extra-vars:
script: |
@ -37,7 +39,6 @@
export DEVSTACK_GATE_GRENADE=pullup
export DEVSTACK_GATE_OS_TEST_TIMEOUT=2400
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"
- builder: