From af7086c20eb8f60221de53d41f5c15bbc13da5c4 Mon Sep 17 00:00:00 2001 From: Sergey Kolekonov Date: Tue, 13 Jan 2015 14:35:18 +0300 Subject: [PATCH] Disable tests for RPM packages Tests for RPM packages should be disabled until migration to CentOS 7 is completed Change-Id: I498e0d703020fdb70fb7a9ffb2bb67f8ffe53fbf --- rpm/SPECS/openstack-neutron.spec | 6 +++--- tests/runtests.sh | 9 ++++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/rpm/SPECS/openstack-neutron.spec b/rpm/SPECS/openstack-neutron.spec index dcc14049b..9a8640649 100644 --- 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 a730baa8f..7d63238c8 100755 --- 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 -- 2.32.3