openstack/project-config
Code Issues Proposed changes

Merge "[magnum] Fix experimental ironic jobs"

Browse Source
This commit is contained in:
Jenkins 2017-03-09 09:15:13 +00:00 committed by Gerrit Code Review
commit c53cfbe788
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jenkins/jobs/magnum.yaml
View File

@ -111,7 +111,6 @@
export DEVSTACK_LOCAL_CONFIGi+=$'\n'"ENABLE_IDENTITY_V2=False" export DEVSTACK_LOCAL_CONFIGi+=$'\n'"ENABLE_IDENTITY_V2=False"
fi fi
special=""
if [ "{ironic}" -eq 1 ] ; then if [ "{ironic}" -eq 1 ] ; then
export PROJECTS="openstack/ironic $PROJECTS" export PROJECTS="openstack/ironic $PROJECTS"
export PROJECTS="openstack/ironic-lib $PROJECTS" export PROJECTS="openstack/ironic-lib $PROJECTS"
@ -119,7 +118,7 @@
export PROJECTS="openstack/python-ironicclient $PROJECTS" export PROJECTS="openstack/python-ironicclient $PROJECTS"
export PROJECTS="openstack/pyghmi $PROJECTS" export PROJECTS="openstack/pyghmi $PROJECTS"
export PROJECTS="openstack/virtualbmc $PROJECTS" export PROJECTS="openstack/virtualbmc $PROJECTS"
special="-ironic" export MAGNUM_GATE_SPECIAL="-ironic"
fi fi
if [ "{horizon}" -eq 0 ] ; then if [ "{horizon}" -eq 0 ] ; then
@ -144,15 +143,15 @@
export KEEP_LOCALRC=1 export KEEP_LOCALRC=1
function gate_hook {{ function gate_hook {{
cd /opt/stack/new/magnum/ cd /opt/stack/new/magnum/
./magnum/tests/contrib/gate_hook.sh {coe} $special ./magnum/tests/contrib/gate_hook.sh {coe} $MAGNUM_GATE_SPECIAL
}} }}
export -f gate_hook export -f gate_hook
function post_test_hook {{ function post_test_hook {{
source $BASE/new/devstack/accrc/admin/admin source $BASE/new/devstack/accrc/admin/admin
cd /opt/stack/new/magnum/ cd /opt/stack/new/magnum/
./magnum/tests/contrib/post_test_hook.sh {coe} $special ./magnum/tests/contrib/post_test_hook.sh {coe} $MAGNUM_GATE_SPECIAL
}} }}
export -f post_test_hook export -f post_test_hook