diff --git a/jenkins/jobs/ironic.yaml b/jenkins/jobs/ironic.yaml index 671d06e57a..7320087453 100644 --- a/jenkins/jobs/ironic.yaml +++ b/jenkins/jobs/ironic.yaml @@ -102,11 +102,13 @@ fi 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 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 + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic-inspector https://git.openstack.org/openstack/ironic-inspector" if [ "{ramdisk}" == "ipa" ] ; then 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 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 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 + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic-inspector https://git.openstack.org/openstack/ironic-inspector" function post_test_hook {{ source $BASE/new/devstack/openrc admin admin