Disable tests for RPM packages

Tests for RPM packages should be disabled
until migration to CentOS 7 is completed

Change-Id: I498e0d703020fdb70fb7a9ffb2bb67f8ffe53fbf

diff --git a/rpm/SPECS/openstack-neutron.spec b/rpm/SPECS/openstack-neutron.spec
index dcc14049b6bfe3a5dcf74e74049a938b8f847457..9a864064911dba3c77e8733b49325adaa6cf0949 100644 (file)
--- a/rpm/SPECS/openstack-neutron.spec
+++ b/rpm/SPECS/openstack-neutron.spec
@@ -584,7 +584,7 @@ exit 0
 if [ $1 -eq 1 ] ; then
     # Initial installation
     /sbin/chkconfig --add neutron-server
-    for agent in dhcp l3 metadata lbaas; do
+    for agent in dhcp l3 metadata; do
       /sbin/chkconfig --add neutron-$agent-agent
     done
 fi
@@ -594,7 +594,7 @@ if [ $1 -eq 0 ] ; then
     # Package removal, not upgrade
     /sbin/service neutron-server stop >/dev/null 2>&1
     /sbin/chkconfig --del neutron-server
-    for agent in dhcp l3 metadata lbaas; do
+    for agent in dhcp l3 metadata; do
       /sbin/service neutron-$agent-agent stop >/dev/null 2>&1
       /sbin/chkconfig --del neutron-$agent-agent
     done
@@ -604,7 +604,7 @@ fi
 if [ $1 -ge 1 ] ; then
     # Package upgrade, not uninstall
     /sbin/service neutron-server condrestart >/dev/null 2>&1 || :
-    for agent in dhcp l3 metadata lbaas; do
+    for agent in dhcp l3 metadata; do
       /sbin/service neutron-$agent-agent condrestart >/dev/null 2>&1 || :
     done
 fi

diff --git a/tests/runtests.sh b/tests/runtests.sh
index a730baa8f0255dcd1fd1f121876ecff4f01a14df..7d63238c8f5d83cc13ed19d336af6ed56dd119f5 100755 (executable)
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -11,7 +11,14 @@ AUTH="--os-auth-url http://127.0.0.1:35357 --os-token $TOKEN --os-endpoint http:
 NEUTRON_AUTH="--os-username neutron --os-password neutron --os-tenant-name neutron --os-auth-url http://127.0.0.1:35357/v2.0"
 CORE_PLUGIN="neutron.plugins.ml2.plugin.Ml2Plugin"
 
-if [[ $PLATFORM =~ Ubuntu ]]; then UBUNTU=true; fi
+if [[ $PLATFORM =~ Ubuntu ]]
+then UBUNTU=true
+else
+   #Tests for RPM packages are disabled
+   #until migration to CentOS 7 is completed
+   echo "RPM tests are temporarily disabled"
+   exit 0
+fi
 if [ -z $PACKAGE ]; then echo "Package for testing is not specified"; exit 1; fi
 echo "127.0.10.1 $(hostname)" >> /etc/hosts