Merge "Fix variable usage in ceph job"

This commit is contained in:
Jenkins 2017-05-09 07:26:00 +00:00 committed by Gerrit Code Review
commit fbdfa0c564

@ -1880,8 +1880,8 @@
# If an in-repo configuration exists, source it. This will likely
# override DEVSTACK_GATE_TEMPEST_REGEX to further refine the set of
# tests being run.
if [ -f "/opt/stack/new/{plugin-repo}/tempest-conf.sh" ]; then
export DEVSTACK_GATE_SETTINGS=/opt/stack/new/{plugin-repo}/tempest-conf.sh
if [ -f "/opt/stack/new/devstack-plugin-{plugin}/tempest-conf.sh" ]; then
export DEVSTACK_GATE_SETTINGS=/opt/stack/new/devstack-plugin-{plugin}/tempest-conf.sh
fi
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh