Add scenario003, rebalance projects across scenarios and tweak workers

scenario001 would install successfully but run out of RAM during
the tempest run.
Create a third scenario and rebalance configuration across these
three different tests.
Additionnally, use the new --service-workers parameter to hardcode
"2" instead of defaulting to $::processorcount which is 8 in the gate
to lower memory usage.

Change-Id: I92a3f45766d45d6a7ee34f0ff306cf67c26e34f6
This commit is contained in:
David Moreau Simard 2016-02-26 14:41:32 -05:00
parent d9567272a5
commit 57063e67b9
4 changed files with 57 additions and 28 deletions

View File

@ -182,22 +182,23 @@ reproduce these tests on your environment if you wish.
This is the current matrix of available tests: This is the current matrix of available tests:
| - | scenario001 | scenario002 | | - | scenario001 | scenario002 | scenario003 |
|:----------:|:-----------:|:-----------:| |:----------:|:-----------:|:-----------:|:------------:
| keystone | X | X | | keystone | X | X | X |
| glance | X | X | | glance | file | swift | file |
| nova | X | X | | nova | X | X | X |
| neutron | X | X | | neutron | X | X | X |
| cinder | X | | | cinder | X | | |
| ceilometer | X | | | ceilometer | | | X |
| aodh | X | | | aodh | | | X |
| heat | | X | | gnocchi | | | X |
| swift | | X | | heat | | | X |
| sahara | | X | | swift | | X | |
| trove | | X | | sahara | | X | |
| horizon | | X | | trove | | X | |
| manila | X | | | horizon | X | | |
| nagios | X | | | manila | X | | |
| nagios | X | | |
To run these tests: To run these tests:

View File

@ -9,24 +9,23 @@ echo -e "Generating packstack config for:
- nova - nova
- neutron (ovs+vxlan) - neutron (ovs+vxlan)
- cinder (lvm+iscsi) - cinder (lvm+iscsi)
- ceilometer
- aodh
- gnocchi
- trove
- manila - manila
- nagios - nagios
- tempest (regex: 'smoke TelemetryAlarming')" - tempest (regex: 'smoke')"
echo "tempest will run if packstack's installation completes successfully." echo "tempest will run if packstack's installation completes successfully."
echo echo
$SUDO packstack --allinone \ $SUDO packstack --allinone \
--debug \ --debug \
--service-workers=2 \
--default-password="packstack" \ --default-password="packstack" \
--os-aodh-install=n \
--os-ceilometer-install=n \
--os-gnocchi-install=n \
--os-swift-install=n \ --os-swift-install=n \
--os-horizon-install=n \
--os-manila-install=y \ --os-manila-install=y \
--glance-backend=swift \ --glance-backend=file \
--provision-demo=y \ --provision-demo=y \
--provision-tempest=y \ --provision-tempest=y \
--run-tempest=y \ --run-tempest=y \
--run-tempest-tests="smoke TelemetryAlarming" || export FAILURE=true --run-tempest-tests="smoke dashboard" || export FAILURE=true

View File

@ -8,10 +8,8 @@ echo -e "Generating packstack config for:
- glance (swift backend) - glance (swift backend)
- nova - nova
- neutron (ovs+vxlan) - neutron (ovs+vxlan)
- heat
- swift - swift
- sahara - sahara
- horizon
- trove - trove
- tempest (regex: 'smoke dashboard')" - tempest (regex: 'smoke dashboard')"
echo "tempest will run if packstack's installation completes successfully." echo "tempest will run if packstack's installation completes successfully."
@ -19,17 +17,18 @@ echo
$SUDO packstack --allinone \ $SUDO packstack --allinone \
--debug \ --debug \
--service-workers=2 \
--default-password="packstack" \ --default-password="packstack" \
--os-aodh-install=n \ --os-aodh-install=n \
--os-ceilometer-install=n \ --os-ceilometer-install=n \
--os-gnocchi-install=n \ --os-gnocchi-install=n \
--os-cinder-install=n \ --os-cinder-install=n \
--os-horizon-install=n \
--nagios-install=n \ --nagios-install=n \
--glance-backend=swift \ --glance-backend=swift \
--os-sahara-install=y \ --os-sahara-install=y \
--os-heat-install=y \
--os-trove-install=y \ --os-trove-install=y \
--provision-demo=y \ --provision-demo=y \
--provision-tempest=y \ --provision-tempest=y \
--run-tempest=y \ --run-tempest=y \
--run-tempest-tests="smoke dashboard" || export FAILURE=true --run-tempest-tests="smoke" || export FAILURE=true

30
tests/scenario003.sh Normal file
View File

@ -0,0 +1,30 @@
#!/bin/bash
if [ $(id -u) != 0 ]; then
SUDO='sudo'
fi
echo -e "Generating packstack config for:
- keystone
- glance (file backend)
- nova
- neutron (ovs+vxlan)
- ceilometer
- aodh
- gnocchi
- heat
- tempest (regex: 'smoke TelemetryAlarming')"
echo "tempest will run if packstack's installation completes successfully."
echo
$SUDO packstack --allinone \
--debug \
--service-workers=2 \
--default-password="packstack" \
--os-swift-install=n \
--os-horizon-install=n \
--glance-backend=file \
--os-heat-install=y \
--provision-demo=y \
--provision-tempest=y \
--run-tempest=y \
--run-tempest-tests="smoke TelemetryAlarming" || export FAILURE=true