Skip to content

Commit

Permalink
Apply the coredump-collecting tweaks to RHEL jobs as well
Browse files Browse the repository at this point in the history
Follow-up to b270551.
  • Loading branch information
mrc0mmand committed Oct 19, 2023
1 parent 3bcefe6 commit 484ee0b
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 3 deletions.
14 changes: 11 additions & 3 deletions agent/testsuite-rhel8.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,14 @@ else
fi

# Enable systemd-coredump
if [[ $COLLECT_COREDUMPS -ne 0 ]] && ! coredumpctl_init; then
echo >&2 "Failed to configure systemd-coredump/coredumpctl"
exit 1
if [[ $COLLECT_COREDUMPS -ne 0 ]]; then
if ! coredumpctl_init; then
echo >&2 "Failed to configure systemd-coredump/coredumpctl"
exit 1
fi

# Collect any coredumps that happened during boot
exectask "coredumpctl_collect_boot" "coredumpctl_collect"
fi

set +e
Expand Down Expand Up @@ -74,6 +79,9 @@ exectask "ninja-test" "meson test -C build --print-errorlogs --timeout-multiplie
# Copy over meson test artifacts
[[ -d "build/meson-logs" ]] && rsync -amq --include '*.txt' --include '*/' --exclude '*' "build/meson-logs" "$LOGDIR"

# Ignore any coredumps generated by unit tests, as there's a lot of intentional crashes
coredumpctl_set_ts

## Integration test suite ##
CHECK_LIST=()
SKIP_LIST=(
Expand Down
6 changes: 6 additions & 0 deletions agent/testsuite-rhel9-sanitizers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ if ! coredumpctl_init; then
exit 1
fi

# Collect any coredumps that happened during boot
exectask "coredumpctl_collect_boot" "coredumpctl_collect"

centos_ensure_qemu_symlink

if [[ $(cat /proc/sys/user/max_user_namespaces) -le 0 ]]; then
Expand Down Expand Up @@ -106,6 +109,9 @@ exectask "check-meson-logs-for-sanitizer-errors" "cat $BUILD_DIR/meson-logs/test
# Copy over meson test artifacts
[[ -d "$BUILD_DIR/meson-logs" ]] && rsync -amq --include '*.txt' --include '*/' --exclude '*' "$BUILD_DIR/meson-logs" "$LOGDIR"

# Ignore any coredumps generated by unit tests, as there's a lot of intentional crashes
coredumpctl_set_ts

## Generate a custom-tailored initrd for the integration tests
# The host initrd contains multipath modules & services which are unused
# in the integration tests and sometimes cause unexpected failures. Let's build
Expand Down
6 changes: 6 additions & 0 deletions agent/testsuite-rhel9.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ if ! coredumpctl_init; then
exit 1
fi

# Collect any coredumps that happened during boot
exectask "coredumpctl_collect_boot" "coredumpctl_collect"

if [[ $(cat /proc/sys/user/max_user_namespaces) -le 0 ]]; then
echo >&2 "user.max_user_namespaces must be > 0"
exit 1
Expand Down Expand Up @@ -102,6 +105,9 @@ if ! git diff --quiet main HEAD && ! git diff "$(git merge-base main HEAD)" --na
finish_and_exit
fi

# Ignore any coredumps generated by unit tests, as there's a lot of intentional crashes
coredumpctl_set_ts

## Integration test suite ##
EXECUTED_LIST=()
FLAKE_LIST=(
Expand Down

0 comments on commit 484ee0b

Please sign in to comment.