openstack/puppet-openstack-integration
Code Issues Proposed changes

run_tests: allow to run another scenario

Browse Source 
* create $SCENARIO environment variable.
* test if fixtures/$SCENARIO.pp file exist or fail early.
* in comment, drop OpenStack project names hard-coding.

Change-Id: I80f07ba6ee2123bc24eb33eac6f600e2ea7c63da
This commit is contained in:
Emilien Macchi 2015-10-01 12:46:02 -04:00
parent 30efa3463c
commit 01927dc056
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
run_tests.sh
View File

@ -13,6 +13,13 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
export SCENARIO=${SCENARIO:-scenario001}
if [ ! -f fixtures/${SCENARIO}.pp ]; then
echo "fixtures/${SCENARIO}.pp file does not exist. Please define a valid scenario."
exit 1
fi
if [ $(id -u) != 0 ]; then if [ $(id -u) != 0 ]; then
# preserve environment so we can have ZUUL_* params # preserve environment so we can have ZUUL_* params
SUDO='sudo -E' SUDO='sudo -E'
@ -65,7 +72,7 @@ $SUDO ./install_modules.sh
# Run puppet and assert something changes. # Run puppet and assert something changes.
set +e set +e
run_puppet scenario001 run_puppet $SCENARIO
RESULT=$? RESULT=$?
set -e set -e
if [ $RESULT -ne 2 ]; then if [ $RESULT -ne 2 ]; then
@ -74,7 +81,7 @@ fi
# Run puppet a second time and assert nothing changes. # Run puppet a second time and assert nothing changes.
set +e set +e
run_puppet scenario001 run_puppet $SCENARIO
RESULT=$? RESULT=$?
set -e set -e
if [ $RESULT -ne 0 ]; then if [ $RESULT -ne 0 ]; then
@ -84,5 +91,5 @@ fi
# TODO(emilien) later, we should use local image if present. That would be a next iteration. # TODO(emilien) later, we should use local image if present. That would be a next iteration.
wget http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img -P /tmp/openstack/tempest wget http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img -P /tmp/openstack/tempest
# run a scenario that validates Keystone, Nova, Glance, Neutron, Ceilometer, Cinder, Sahara, Swift and Heat # run tempest smoke suite
cd /tmp/openstack/tempest; tox -eall -- --concurrency=2 smoke cd /tmp/openstack/tempest; tox -eall -- --concurrency=2 smoke