Merge "networking-midonet: Consume gate_hook if exists"
This commit is contained in:
Jenkins
@@ -26,22 +26,30 @@
|
||||
# our project repository. This makes zuul do the right
|
||||
# reference magic for testing changes.
|
||||
export PROJECTS="openstack/networking-midonet $PROJECTS"
|
||||
# Note the actual url here is somewhat irrelevant because it
|
||||
# caches in nodepool, however make it a valid url for
|
||||
# documentation purposes.
|
||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-midonet git://git.openstack.org/openstack/networking-midonet"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_PLUGIN=midonet"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_RUN_VALIDATION=True"
|
||||
|
||||
# Enable MidoNet v1 architecture
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_PLUGIN=midonet.neutron.plugin_v1.MidonetPluginV2"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_CLIENT=midonet.neutron.client.api.MidonetApiClient"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_USE_ZOOM=False"
|
||||
# NOTE(yamamoto): v2015.06 is the latest stable releases
|
||||
# with v1 support.
|
||||
# REVISIT(yamamoto): Consider switching to stable/v2015.06.4
|
||||
# when available.
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_BRANCH=staging/v2015.06"
|
||||
if [ -f $BASE/new/networking-midonet/devstack/ci/gate_hook.sh ]; then
|
||||
function gate_hook {{
|
||||
bash -xe $BASE/new/networking-midonet/devstack/ci/gate_hook.sh v1
|
||||
}}
|
||||
export -f gate_hook
|
||||
else
|
||||
# Note the actual url here is somewhat irrelevant because it
|
||||
# caches in nodepool, however make it a valid url for
|
||||
# documentation purposes.
|
||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-midonet git://git.openstack.org/openstack/networking-midonet"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_PLUGIN=midonet"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_RUN_VALIDATION=True"
|
||||
|
||||
# Enable MidoNet v1 architecture
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_PLUGIN=midonet.neutron.plugin_v1.MidonetPluginV2"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_CLIENT=midonet.neutron.client.api.MidonetApiClient"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_USE_ZOOM=False"
|
||||
# NOTE(yamamoto): v2015.06 is the latest stable releases
|
||||
# with v1 support.
|
||||
# REVISIT(yamamoto): Consider switching to stable/v2015.06.4
|
||||
# when available.
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_BRANCH=staging/v2015.06"
|
||||
fi
|
||||
|
||||
export DEVSTACK_GATE_SETTINGS=/opt/stack/new/networking-midonet/devstack/devstackgaterc
|
||||
|
||||
@@ -81,18 +89,26 @@
|
||||
# our project repository. This makes zuul do the right
|
||||
# reference magic for testing changes.
|
||||
export PROJECTS="openstack/networking-midonet $PROJECTS"
|
||||
# Note the actual url here is somewhat irrelevant because it
|
||||
# caches in nodepool, however make it a valid url for
|
||||
# documentation purposes.
|
||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-midonet git://git.openstack.org/openstack/networking-midonet"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_PLUGIN=midonet"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_RUN_VALIDATION=True"
|
||||
|
||||
# Enable MidoNet v2 architecture
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_PLUGIN=midonet.neutron.plugin_v2.MidonetPluginV2"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_CLIENT=midonet.neutron.client.api.MidonetApiClient"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_SERVICE_PLUGIN_CLASSES=midonet.neutron.services.l3.l3_midonet.MidonetL3ServicePlugin"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_USE_ZOOM=True"
|
||||
if [ -f $BASE/new/networking-midonet/devstack/ci/gate_hook.sh ]; then
|
||||
function gate_hook {{
|
||||
bash -xe $BASE/new/networking-midonet/devstack/ci/gate_hook.sh v2
|
||||
}}
|
||||
export -f gate_hook
|
||||
else
|
||||
# Note the actual url here is somewhat irrelevant because it
|
||||
# caches in nodepool, however make it a valid url for
|
||||
# documentation purposes.
|
||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-midonet git://git.openstack.org/openstack/networking-midonet"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_PLUGIN=midonet"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_RUN_VALIDATION=True"
|
||||
|
||||
# Enable MidoNet v2 architecture
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_PLUGIN=midonet.neutron.plugin_v2.MidonetPluginV2"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_CLIENT=midonet.neutron.client.api.MidonetApiClient"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_SERVICE_PLUGIN_CLASSES=midonet.neutron.services.l3.l3_midonet.MidonetL3ServicePlugin"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_USE_ZOOM=True"
|
||||
fi
|
||||
|
||||
export DEVSTACK_GATE_SETTINGS=/opt/stack/new/networking-midonet/devstack/devstackgaterc
|
||||
|
||||
@@ -130,17 +146,25 @@
|
||||
# our project repository. This makes zuul do the right
|
||||
# reference magic for testing changes.
|
||||
export PROJECTS="openstack/networking-midonet $PROJECTS"
|
||||
# Note the actual url here is somewhat irrelevant because it
|
||||
# caches in nodepool, however make it a valid url for
|
||||
# documentation purposes.
|
||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-midonet git://git.openstack.org/openstack/networking-midonet"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_PLUGIN=ml2"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_RUN_VALIDATION=True"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ML2_PLUGIN_MECHANISM_DRIVERS=midonet"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ML2_PLUGIN_TYPE_DRIVERS=midonet,uplink"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ML2_TENANT_NETWORK_TYPE=midonet"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"ML2_L3_PLUGIN=midonet.neutron.services.l3.l3_midonet.MidonetL3ServicePlugin"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_USE_ZOOM=True"
|
||||
|
||||
if [ -f $BASE/new/networking-midonet/devstack/ci/gate_hook.sh ]; then
|
||||
function gate_hook {{
|
||||
bash -xe $BASE/new/networking-midonet/devstack/ci/gate_hook.sh ml2
|
||||
}}
|
||||
export -f gate_hook
|
||||
else
|
||||
# Note the actual url here is somewhat irrelevant because it
|
||||
# caches in nodepool, however make it a valid url for
|
||||
# documentation purposes.
|
||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-midonet git://git.openstack.org/openstack/networking-midonet"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_PLUGIN=ml2"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_RUN_VALIDATION=True"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ML2_PLUGIN_MECHANISM_DRIVERS=midonet"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ML2_PLUGIN_TYPE_DRIVERS=midonet,uplink"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_ML2_TENANT_NETWORK_TYPE=midonet"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"ML2_L3_PLUGIN=midonet.neutron.services.l3.l3_midonet.MidonetL3ServicePlugin"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_USE_ZOOM=True"
|
||||
fi
|
||||
|
||||
export DEVSTACK_GATE_SETTINGS=/opt/stack/new/networking-midonet/devstack/devstackgaterc
|
||||
|
||||
@@ -179,19 +203,27 @@
|
||||
# reference magic for testing changes.
|
||||
export PROJECTS="openstack/networking-midonet $PROJECTS"
|
||||
export PROJECTS="openstack/rally $PROJECTS"
|
||||
# Note the actual url here is somewhat irrelevant because it
|
||||
# caches in nodepool, however make it a valid url for
|
||||
# documentation purposes.
|
||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-midonet git://git.openstack.org/openstack/networking-midonet"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin rally git://git.openstack.org/openstack/rally"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_PLUGIN=midonet"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_RUN_VALIDATION=True"
|
||||
|
||||
# Enable MidoNet v2 architecture
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_PLUGIN=midonet.neutron.plugin_v2.MidonetPluginV2"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_CLIENT=midonet.neutron.client.api.MidonetApiClient"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_SERVICE_PLUGIN_CLASSES=midonet.neutron.services.l3.l3_midonet.MidonetL3ServicePlugin"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_USE_ZOOM=True"
|
||||
if [ -f $BASE/new/networking-midonet/devstack/ci/gate_hook.sh ]; then
|
||||
function gate_hook {{
|
||||
bash -xe $BASE/new/networking-midonet/devstack/ci/gate_hook.sh rally
|
||||
}}
|
||||
export -f gate_hook
|
||||
else
|
||||
# Note the actual url here is somewhat irrelevant because it
|
||||
# caches in nodepool, however make it a valid url for
|
||||
# documentation purposes.
|
||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin networking-midonet git://git.openstack.org/openstack/networking-midonet"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin rally git://git.openstack.org/openstack/rally"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_PLUGIN=midonet"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_RUN_VALIDATION=True"
|
||||
|
||||
# Enable MidoNet v2 architecture
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_PLUGIN=midonet.neutron.plugin_v2.MidonetPluginV2"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_CLIENT=midonet.neutron.client.api.MidonetApiClient"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"Q_SERVICE_PLUGIN_CLASSES=midonet.neutron.services.l3.l3_midonet.MidonetL3ServicePlugin"
|
||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"MIDONET_USE_ZOOM=True"
|
||||
fi
|
||||
|
||||
export DEVSTACK_GATE_SETTINGS=/opt/stack/new/networking-midonet/devstack/devstackgaterc
|
||||
|
||||
|
||||
Reference in New Issue
Block a user