Skip to content

Commit 8f6e5b2

Browse files
committed
further adjust mzcompose hook
1 parent cf0a817 commit 8f6e5b2

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

ci/builder/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ RUN apt-get update --fix-missing && TZ=UTC DEBIAN_FRONTEND=noninteractive apt-ge
4242
ca-certificates \
4343
curl \
4444
docker.io \
45+
gdb \
4546
git \
4647
gnupg2 \
4748
libxml2 \

ci/plugins/mzcompose/hooks/pre-exit

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ set -euo pipefail
1414
. misc/shlib/shlib.bash
1515

1616
run() {
17-
bin/ci-builder run stable bin/mzcompose --mz-quiet --find "$BUILDKITE_PLUGIN_MZCOMPOSE_COMPOSITION" "$@"
17+
bin/ci-builder run min bin/mzcompose --mz-quiet --find "$BUILDKITE_PLUGIN_MZCOMPOSE_COMPOSITION" "$@"
1818
}
1919

2020
echo "Collecting logs"
@@ -47,10 +47,10 @@ mv "$HOME"/cores .
4747

4848
if find cores -name 'core.*' | grep -q .; then
4949
# Best effort attempt to fetch interesting executables to get backtrace of core files
50-
bin/ci-builder run stable cp /mnt/build/debug/clusterd cores/ || true
51-
bin/ci-builder run stable cp /mnt/build/debug/environmentd cores/ || true
52-
bin/ci-builder run stable cp /mnt/build/debug/mz-balancerd cores/balancerd || true
53-
bin/ci-builder run stable cp /mnt/build/debug/sqllogictest cores/ || true
50+
bin/ci-builder run min cp /mnt/build/debug/clusterd cores/ || true
51+
bin/ci-builder run min cp /mnt/build/debug/environmentd cores/ || true
52+
bin/ci-builder run min cp /mnt/build/debug/mz-balancerd cores/balancerd || true
53+
bin/ci-builder run min cp /mnt/build/debug/sqllogictest cores/ || true
5454
run cp sqllogictest:/usr/local/bin/sqllogictest cores/ || true
5555
run cp sqllogictest:/usr/local/bin/clusterd cores/ || true
5656
run cp materialized:/usr/local/bin/environmentd cores/ || true
@@ -63,14 +63,14 @@ echo "Finding core files"
6363
find cores -name 'core.*' | while read -r core; do
6464
exe=$(echo "$core" | sed -e "s/core\.\(.*\)\.[0-9]*/\1/" -e "s/.*\!//")
6565
# Core dumps can take a while to be written, so if extracting the info fails, try again later
66-
bin/ci-builder run stable gdb --batch -ex "bt full" -ex "thread apply all bt" -ex "quit" cores/"$exe" "$core" > "$core".txt || (sleep 2m; bin/ci-builder run stable gdb --batch -ex "bt full" -ex "thread apply all bt" -ex "quit" cores/"$exe" "$core" > "$core".txt || true)
66+
bin/ci-builder run min gdb --batch -ex "bt full" -ex "thread apply all bt" -ex "quit" cores/"$exe" "$core" > "$core".txt || (sleep 2m; bin/ci-builder run min gdb --batch -ex "bt full" -ex "thread apply all bt" -ex "quit" cores/"$exe" "$core" > "$core".txt || true)
6767
buildkite-agent artifact upload "$core".txt
6868
done
6969
# can be huge, clean up
7070
rm -rf cores
7171

7272
echo "Compressing parallel-workload-queries.log"
73-
bin/ci-builder run stable zstd --rm parallel-workload-queries.log || true
73+
bin/ci-builder run min zstd --rm parallel-workload-queries.log || true
7474

7575
echo "Uploading log artifacts"
7676
mapfile -t artifacts < <(printf "run.log\nservices.log\njournalctl-merge.log\nnetstat-ant.log\nnetstat-panelot.log\nps-aux.log\ndocker-ps-a.log\ndocker-inspect.log\n"; find . -name 'junit_*.xml')
@@ -82,7 +82,7 @@ CI_ANNOTATE_ERRORS_RESULT=0
8282
# Uploading large files currently sometimes hangs, as a temporary workaround
8383
# timeout and don't fail, TODO(def-) Remove timeout again
8484
timeout 300 buildkite-agent artifact upload "$artifacts_str" || true
85-
bin/ci-builder run stable bin/ci-annotate-errors --test-cmd="$(cat test_cmd)" --test-desc="$(cat test_desc)" "${artifacts[@]}" > ci-annotate-errors.log || CI_ANNOTATE_ERRORS_RESULT=$?
85+
bin/ci-builder run min bin/ci-annotate-errors --test-cmd="$(cat test_cmd)" --test-desc="$(cat test_desc)" "${artifacts[@]}" > ci-annotate-errors.log || CI_ANNOTATE_ERRORS_RESULT=$?
8686
buildkite-agent artifact upload "ci-annotate-errors.log"
8787

8888
if [ ! -s services.log ] && [ "$BUILDKITE_LABEL" != "Maelstrom coverage of persist" ] && [ "$BUILDKITE_LABEL" != "Long single-node Maelstrom coverage of persist" ] && [ "$BUILDKITE_LABEL" != "Maelstrom coverage of txn-wal" ] && [ "$BUILDKITE_LABEL" != "Mz E2E Test" ] && [ "$BUILDKITE_LABEL" != "Output consistency (version for DFR)" ] && [ "$BUILDKITE_LABEL" != "Output consistency (version for CTF)" ] && [ "$BUILDKITE_LABEL" != "QA Canary Environment Base Load" ] && [ "$BUILDKITE_LABEL" != "Parallel Benchmark against QA Canary Environment" ] && [ "$BUILDKITE_LABEL" != "Parallel Benchmark against QA Benchmarking Staging Environment" ] && [ "$BUILDKITE_LABEL" != "Terraform + Helm Chart E2E on AWS" ]; then

0 commit comments

Comments
 (0)