Merge "Skip searching selinux alerts"
This commit is contained in:
commit
1ad769db06
10
run_tests.sh
10
run_tests.sh
|
@ -229,8 +229,8 @@ set -e
|
||||||
if [ $RESULT -ne 0 ] && [ $RESULT -ne 2 ]; then
|
if [ $RESULT -ne 0 ] && [ $RESULT -ne 2 ]; then
|
||||||
print_header 'First Puppet run contains errors in catalog.'
|
print_header 'First Puppet run contains errors in catalog.'
|
||||||
catch_puppet_failures
|
catch_puppet_failures
|
||||||
print_header 'SELinux Alerts (1st time)'
|
#print_header 'SELinux Alerts (1st time)'
|
||||||
catch_selinux_alerts
|
#catch_selinux_alerts
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
timestamp_puppet_log
|
timestamp_puppet_log
|
||||||
|
@ -244,8 +244,8 @@ set -e
|
||||||
if [ $RESULT -ne 0 ]; then
|
if [ $RESULT -ne 0 ]; then
|
||||||
print_header 'Second Puppet run is not idempotent.'
|
print_header 'Second Puppet run is not idempotent.'
|
||||||
catch_puppet_failures
|
catch_puppet_failures
|
||||||
print_header 'SELinux Alerts (2nd time)'
|
#print_header 'SELinux Alerts (2nd time)'
|
||||||
catch_selinux_alerts
|
#catch_selinux_alerts
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
timestamp_puppet_log
|
timestamp_puppet_log
|
||||||
|
@ -402,7 +402,7 @@ elif [ -d .stestr ]; then
|
||||||
fi
|
fi
|
||||||
subunit2html /tmp/openstack/tempest/testrepository.subunit /tmp/openstack/tempest/testr_results.html
|
subunit2html /tmp/openstack/tempest/testrepository.subunit /tmp/openstack/tempest/testr_results.html
|
||||||
print_header 'SELinux Alerts (Tempest)'
|
print_header 'SELinux Alerts (Tempest)'
|
||||||
catch_selinux_alerts
|
#catch_selinux_alerts
|
||||||
|
|
||||||
print_header 'Done (run_tests.sh)'
|
print_header 'Done (run_tests.sh)'
|
||||||
exit $RESULT
|
exit $RESULT
|
||||||
|
|
Loading…
Reference in New Issue