From 7b102761b58436d00aba52185fbadb1c88390365 Mon Sep 17 00:00:00 2001 From: Spyros Trigazis Date: Wed, 8 Mar 2017 14:01:15 +0100 Subject: [PATCH] [magnum] Fix experimental ironic jobs Export the "special" variable to pass it in post_test_hook and gate hook. Change-Id: I115c8cbbe7f2ae2e21d87011b5c5303390df9187 --- jenkins/jobs/magnum.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/jenkins/jobs/magnum.yaml b/jenkins/jobs/magnum.yaml index b22ada18de..08e202ff65 100644 --- a/jenkins/jobs/magnum.yaml +++ b/jenkins/jobs/magnum.yaml @@ -111,7 +111,6 @@ export DEVSTACK_LOCAL_CONFIGi+=$'\n'"ENABLE_IDENTITY_V2=False" fi - special="" if [ "{ironic}" -eq 1 ] ; then export PROJECTS="openstack/ironic $PROJECTS" export PROJECTS="openstack/ironic-lib $PROJECTS" @@ -119,7 +118,7 @@ export PROJECTS="openstack/python-ironicclient $PROJECTS" export PROJECTS="openstack/pyghmi $PROJECTS" export PROJECTS="openstack/virtualbmc $PROJECTS" - special="-ironic" + export MAGNUM_GATE_SPECIAL="-ironic" fi if [ "{horizon}" -eq 0 ] ; then @@ -144,15 +143,15 @@ export KEEP_LOCALRC=1 function gate_hook {{ - cd /opt/stack/new/magnum/ - ./magnum/tests/contrib/gate_hook.sh {coe} $special + cd /opt/stack/new/magnum/ + ./magnum/tests/contrib/gate_hook.sh {coe} $MAGNUM_GATE_SPECIAL }} export -f gate_hook function post_test_hook {{ source $BASE/new/devstack/accrc/admin/admin 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