openstack/puppet-openstack-integration
Code Issues Proposed changes

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

Browse Source 
This reverts commit 6d219f2a28012181384c0891f62c5c630636faf1.

Change-Id: If8567fe1abb141d06cacf4ccbc3eada8e8cfcc3b
This commit is contained in:
Emilien Macchi 2018-01-05 07:17:24 -08:00
parent ffb28ec4c0
commit 259cd4e726
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
run_tests.sh
View File

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