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

This commit is contained in:
Zuul 2018-01-04 20:29:26 +00:00 committed by Gerrit Code Review
commit 21630bfb0f

View File

@ -224,6 +224,9 @@ if [ $RESULT -ne 0 ] && [ $RESULT -ne 2 ]; then
fi
timestamp_puppet_log
# 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)"
@ -238,6 +241,7 @@ if [ $RESULT -ne 0 ]; then
exit 1
fi
timestamp_puppet_log
fi
print_header 'Prepare Tempest'