openstack
/
vitrage
Code Issues Proposed changes

Tempest Gate 

1. Updated localrc configuration before running devstack-vm-gate.sh under gate_hook.sh
2. Fixed(hopefully) post_test_hook.sh to run all tempest tests under vitrage_tempest_tests folder

Change-Id: I5f6947fdae7f35669a1d7488b02179dc04caee36
This commit is contained in:
Noam Bloom 2016-05-01 17:26:32 +03:00
parent f80b9883a8
commit 71670c59f9
2 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
devstack/gate_hook.sh
View File

@ -18,25 +18,40 @@ export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_ALL=1
export DEVSTACK_GATE_TEMPEST_FULL=0
export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=0
export DEVSTACK_GATE_TEMPEST_REGEX="vitrage_tempest_tests"
export DEVSTACK_GATE_TEMPEST_REGEX=""
if [ -z ${DEVSTACK_LOCAL_CONFIG+x} ]; then
DEVSTACK_LOCAL_CONFIG="enable_plugin vitrage git://git.openstack.org/openstack/vitrage"
DEVSTACK_LOCAL_CONFIG="enable_plugin vitrage https://git.openstack.org/openstack/vitrage"
fi
DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin vitrage-dashboard https://git.openstack.org/openstack/vitrage-dashboard"
DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer"
DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh"
DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh https://git.openstack.org/openstack/aodh"
DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-alarm-evaluator,ceilometer-alarm-notifier"
DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service n-net"
DEVSTACK_LOCAL_CONFIG+=$'\n'"[[post-config|$NOVA_CONF]]"
DEVSTACK_LOCAL_CONFIG+=$'\n'"[DEFAULT]"
DEVSTACK_LOCAL_CONFIG+=$'\n'"notification_topics = notifications,vitrage_notifications"
DEVSTACK_LOCAL_CONFIG+=$'\n'"notification_driver=messagingv2"
DEVSTACK_LOCAL_CONFIG+=$'\n'"[[post-config|$NEUTRON_CONF]]"
DEVSTACK_LOCAL_CONFIG+=$'\n'"[DEFAULT]"
DEVSTACK_LOCAL_CONFIG+=$'\n'"notification_topics = notifications,vitrage_notifications"
DEVSTACK_LOCAL_CONFIG+=$'\n'"notification_driver=messagingv2"
DEVSTACK_LOCAL_CONFIG+=$'\n'"[[post-config|$CINDER_CONF]]"
DEVSTACK_LOCAL_CONFIG+=$'\n'"[DEFAULT]"
DEVSTACK_LOCAL_CONFIG+=$'\n'"notification_topics = notifications,vitrage_notifications"
DEVSTACK_LOCAL_CONFIG+=$'\n'"notification_driver=messagingv2"
export DEVSTACK_LOCAL_CONFIG
if [ -z ${ENABLED_SERVICES+x} ]; then
ENABLED_SERVICES=tempest
fi
ENABLED_SERVICES+=key,aodi-api,aodh-notifier,aodh-evaluator
ENABLED_SERVICES+=ceilometer-acompute,ceilometer-acentral,ceilometer-anotification,ceilometer-collector
ENABLED_SERVICES+=ceilometer-alarm-evaluator,ceilometer-alarm-notifier
ENABLED_SERVICES+=ceilometer-api
ENABLED_SERVICES+=,vitrage-api,vitrage-graph
ENABLED_SERVICES+=,q-svc,q-dhcp,q-meta,q-agt,q-l3
ENABLED_SERVICES+=,key,aodi-api,aodh-notifier,aodh-evaluator
ENABLED_SERVICES+=,ceilometer-alarm-evaluator,ceilometer-alarm-notifier
ENABLED_SERVICES+=,ceilometer-api
export ENABLED_SERVICES
export KEEP_LOCALRC=1
$BASE/new/devstack-gate/devstack-vm-gate.sh
$BASE/new/devstack-gate/devstack-vm-gate.sh

17
devstack/post_test_hook.sh
View File

@ -13,21 +13,16 @@
# License for the specific language governing permissions and limitations
# under the License.
(cd $BASE/new/tempest/; sudo virtualenv .venv)
source $BASE/new/tempest/.venv/bin/activate
(cd $BASE/new/vitrage/; sudo virtualenv .venv)
source $BASE/new/vitrage/.venv/bin/activate
(cd $BASE/new/tempest/; sudo pip install -r requirements.txt -r test-requirements.txt)
sudo pip install nose
(cd $BASE/new/tempest/; sudo oslo-config-generator --config-file etc/config-generator.tempest.conf --output-file etc/tempest.conf)
(cd $BASE/new/; sudo sh -c 'cat vitrage/devstack/files/tempest/tempest.conf >> tempest/etc/tempest.conf')
sudo cp $BASE/new/tempest/etc/logging.conf.sample $BASE/new/tempest/etc/logging.conf
(cd $BASE/new/vitrage/; sudo pip install -r requirements.txt -r test-requirements.txt)
(cd $BASE/new/vitrage/; sudo python setup.py install)
(cd $BASE/new/tempest/; sudo testr init)
(cd $BASE/new/vitrage/; sudo rm -rf .testrepository/)
(cd $BASE/new/vitrage/; sudo testr init)
(cd $BASE/new/tempest/; sudo sh -c 'testr list-tests vitrage_tempest_tests > vitrage_tempest_tests')
(cd $BASE/new/tempest/; sudo sh -c 'testr run --subunit --load-list=vitrage_tempest_tests | subunit-trace --fails')
(cd $BASE/new/vitrage/; sudo sh -c 'testr list-tests vitrage_tempest_tests | grep vitrage > vitrage_tempest_tests.list')
(cd $BASE/new/vitrage/; sudo sh -c 'testr run --subunit --load-list=vitrage_tempest_tests.list | subunit-trace --fails')