diff --git a/master-libvirt/master.cfg b/master-libvirt/master.cfg index 332c4979..1a6054b0 100644 --- a/master-libvirt/master.cfg +++ b/master-libvirt/master.cfg @@ -125,6 +125,11 @@ def getPAMTestStep(): haltOnFailure=True, description=["testing", "PAM"], descriptionDone=["test", "PAM"], + env=envFromProperties( + [ + "systemdCapability", + ] + ), command=["./pam-test.sh"], ) diff --git a/scripts/pam-test.sh b/scripts/pam-test.sh index 39f5388a..bee8046a 100644 --- a/scripts/pam-test.sh +++ b/scripts/pam-test.sh @@ -4,6 +4,8 @@ set -e # shellcheck disable=SC1091 . ./bash_lib.sh +bb_print_env + if ! which mysql ; then bb_log_err "This step assumes that MariaDB has already been installed" exit 1 @@ -38,7 +40,7 @@ fi sudo mysql -e "UNINSTALL SONAME 'auth_pam'" if mysql -ubuildbot -ptest -e "SHOW GRANTS" > /dev/null 2>&1 ; then res=1 - bb_log_info "User authenticated via PAM v2 (pam_unix) could still connect after uninstalling plugin" + bb_log_err "User authenticated via PAM v2 (pam_unix) could still connect after uninstalling plugin" fi # PAM v1 @@ -61,7 +63,7 @@ fi sudo mysql -e "UNINSTALL SONAME 'auth_pam_v1'" if mysql -ubuildbot -ptest -e "SHOW GRANTS" > /dev/null 2>&1 ; then res=1 - bb_log_info "User authenticated via PAM v1 (pam_unix) could still connect after uninstalling plugin" + bb_log_err "User authenticated via PAM v1 (pam_unix) could still connect after uninstalling plugin" fi #----------------