openstack/project-config
Code Issues Proposed changes

Merge "Run ironic plugin before ironic-inspector one in ironic-inspector jobs"

Browse Source
This commit is contained in:
Jenkins 2015-12-23 12:16:58 +00:00 committed by Gerrit Code Review
commit 4c33366054
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jenkins/jobs/ironic.yaml
View File

@ -102,11 +102,13 @@
fi fi
export PROJECTS="openstack/ironic openstack/ironic-inspector $PROJECTS" export PROJECTS="openstack/ironic openstack/ironic-inspector $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin ironic-inspector https://git.openstack.org/openstack/ironic-inspector"
# devstack plugin didn't exist until mitaka # devstack plugin didn't exist until mitaka
if [[ "$ZUUL_BRANCH" != "stable/liberty" ]] ; then if [[ "$ZUUL_BRANCH" != "stable/liberty" ]] ; then
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic" export DEVSTACK_LOCAL_CONFIG="enable_plugin ironic git://git.openstack.org/openstack/ironic"
else
export DEVSTACK_LOCAL_CONFIG=""
fi fi
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic-inspector https://git.openstack.org/openstack/ironic-inspector"
if [ "{ramdisk}" == "ipa" ] ; then if [ "{ramdisk}" == "ipa" ] ; then
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEPLOY_DRIVER_ISCSI_WITH_IPA=True" export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEPLOY_DRIVER_ISCSI_WITH_IPA=True"
@ -158,11 +160,13 @@
export DEVSTACK_PROJECT_FROM_GIT="python-ironic-inspector-client" export DEVSTACK_PROJECT_FROM_GIT="python-ironic-inspector-client"
export PROJECTS="openstack/ironic openstack/python-ironic-inspector-client openstack/ironic-inspector $PROJECTS" export PROJECTS="openstack/ironic openstack/python-ironic-inspector-client openstack/ironic-inspector $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin ironic-inspector https://git.openstack.org/openstack/ironic-inspector"
# devstack plugin didn't exist until mitaka # devstack plugin didn't exist until mitaka
if [[ "$ZUUL_BRANCH" != "stable/liberty" ]] ; then if [[ "$ZUUL_BRANCH" != "stable/liberty" ]] ; then
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic" export DEVSTACK_LOCAL_CONFIG="enable_plugin ironic git://git.openstack.org/openstack/ironic"
else
export DEVSTACK_LOCAL_CONFIG=""
fi fi
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic-inspector https://git.openstack.org/openstack/ironic-inspector"
function post_test_hook {{ function post_test_hook {{
source $BASE/new/devstack/openrc admin admin source $BASE/new/devstack/openrc admin admin