Spec and test fixes for master branch

[openstack-build/neutron-build.git] / tests / runtests.sh

diff --git a/tests/runtests.sh b/tests/runtests.sh
index 1dff794061cef6d5db2e550a8a20cc2fad96d7e7..5b10b3814159943a32a142685653e734ad3ae5d1 100755 (executable)
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -8,7 +8,6 @@ TOKEN=$(openssl rand -hex 10)
 MYSQL_PASS=mysql_pass
 AUTH="--os-auth-url http://127.0.0.1:35357 --os-token $TOKEN --os-endpoint http://127.0.0.1:35357/v2.0/"
 NEUTRON_AUTH="--os-username neutron --os-password neutron --os-tenant-name neutron --os-auth-url http://127.0.0.1:35357/v2.0"
-FORMAT=" --request-format xml"
 CORE_PLUGIN="neutron.plugins.ml2.plugin.Ml2Plugin"
 
 if [[ $PLATFORM =~ Ubuntu ]]; then UBUNTU=true; fi
@@ -26,8 +25,10 @@ install_packages() {
         yum install -y openstack-keystone rabbitmq-server mysql-server python-oslo-utils
         #Install some plugins because they are required for db-migration scripts (bug #1371184)
         #Ubuntu neutron-server package include them
-        #yum install -y openstack-neutron-bigswitch openstack-neutron-brocade openstack-neutron-cisco openstack-neutron-hyperv openstack-neutron-vmware openstack-neutron-openvswitch \
-        #               openstack-neutron-ryu openstack-neutron-linuxbridge openstack-neutron-metaplugin openstack-neutron-mellanox openstack-neutron-nec openstack-neutron-nuage
+        if [ "$SOURCEBRANCH" == "master" ]; then
+          yum install -y openstack-neutron-bigswitch openstack-neutron-brocade openstack-neutron-cisco openstack-neutron-hyperv openstack-neutron-vmware openstack-neutron-openvswitch \
+                         openstack-neutron-ryu openstack-neutron-linuxbridge openstack-neutron-metaplugin openstack-neutron-mellanox openstack-neutron-nec openstack-neutron-nuage
+        fi
     fi
 }
 
@@ -155,7 +156,7 @@ start_neutron_server () {
 
 check_neutron_server() {
     #Execute tests
-    neutron $NEUTRON_AUTH net-create $FORMAT mynet1
+    neutron $NEUTRON_AUTH net-create mynet1
     CHECK=$(neutron $NEUTRON_AUTH net-list | grep id)
     if [ -z "$CHECK" ]; then echo "Network listing failed" && FAILURE=true; fi
 }