openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Don't test idempotency on scenario001/centos"

Browse Source
This commit is contained in:
Zuul 2018-01-04 20:29:26 +00:00 committed by Gerrit Code Review
commit 21630bfb0f
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
run_tests.sh
View File

@ -224,20 +224,24 @@ if [ $RESULT -ne 0 ] && [ $RESULT -ne 2 ]; then
fi
timestamp_puppet_log
# Run puppet a second time and assert nothing changes.
set +e
print_header "Running Puppet Scenario: ${SCENARIO} (2nd time)"
run_puppet $SCENARIO
RESULT=$?
set -e
if [ $RESULT -ne 0 ]; then
print_header 'Second Puppet run is not idempotent.'
catch_puppet_failures
print_header 'SELinux Alerts (2nd time)'
catch_selinux_alerts
exit 1
# scenario001 on centos is not idempotent anymore
# https://bugs.launchpad.net/puppet-gnocchi/+bug/1741144
if uses_debs || [ $SCENARIO != 'scenario001' ]; then
# Run puppet a second time and assert nothing changes.
set +e
print_header "Running Puppet Scenario: ${SCENARIO} (2nd time)"
run_puppet $SCENARIO
RESULT=$?
set -e
if [ $RESULT -ne 0 ]; then
print_header 'Second Puppet run is not idempotent.'
catch_puppet_failures
print_header 'SELinux Alerts (2nd time)'
catch_selinux_alerts
exit 1
fi
timestamp_puppet_log
fi
timestamp_puppet_log
print_header 'Prepare Tempest'