openstack/project-config
Code Issues Proposed changes

Merge "Use Ironic Inspector tempest plugin from master"

Browse Source
This commit is contained in:
Jenkins 2016-12-20 15:08:29 +00:00 committed by Gerrit Code Review
commit 9f30c29c74
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jenkins/jobs/ironic.yaml
View File

@ -147,7 +147,16 @@
script: | script: |
export PROJECTS="openstack/ironic-inspector $PROJECTS" export PROJECTS="openstack/ironic-inspector $PROJECTS"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic-inspector git://git.openstack.org/openstack/ironic-inspector" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic-inspector git://git.openstack.org/openstack/ironic-inspector"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-inspector'"
# use tempest plugin
if [[ "$ZUUL_BRANCH" != "master" ]] ; then
# NOTE(jroll) if this isn't a patch against master, then
# fetch master to install the plugin
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' git+git://git.openstack.org/openstack/ironic-inspector'"
else
# on master, use the local change, so we can pick up any changes to the plugin
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-inspector'"
fi
export IRONIC_INSPECTOR_AUTO_DISCOVERY={inspector-auto-discovery} export IRONIC_INSPECTOR_AUTO_DISCOVERY={inspector-auto-discovery}
if [ "$IRONIC_INSPECTOR_AUTO_DISCOVERY" == "1" ]; then if [ "$IRONIC_INSPECTOR_AUTO_DISCOVERY" == "1" ]; then
@ -184,10 +193,10 @@
if [[ "$ZUUL_BRANCH" != "master" ]] ; then if [[ "$ZUUL_BRANCH" != "master" ]] ; then
# NOTE(jroll) if this isn't a patch against master, then # NOTE(jroll) if this isn't a patch against master, then
# fetch master to install the plugin # fetch master to install the plugin
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS=git+git://git.openstack.org/openstack/ironic" export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' git+git://git.openstack.org/openstack/ironic'"
else else
# on master, use the local change, so we can pick up any changes to the plugin # on master, use the local change, so we can pick up any changes to the plugin
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS=/opt/stack/new/ironic" export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic'"
fi fi
- builder: - builder: