From 0b2382db3f50e15931c7a5dc62c2303c80e03302 Mon Sep 17 00:00:00 2001 From: Parker Timmerman Date: Tue, 3 Dec 2024 15:00:56 -0500 Subject: [PATCH] further adjust mzcompose hook --- ci/plugins/mzcompose/hooks/pre-exit | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/plugins/mzcompose/hooks/pre-exit b/ci/plugins/mzcompose/hooks/pre-exit index 5153e85197d18..497d8c31e63a5 100755 --- a/ci/plugins/mzcompose/hooks/pre-exit +++ b/ci/plugins/mzcompose/hooks/pre-exit @@ -14,7 +14,7 @@ set -euo pipefail . misc/shlib/shlib.bash run() { - bin/ci-builder run stable bin/mzcompose --mz-quiet --find "$BUILDKITE_PLUGIN_MZCOMPOSE_COMPOSITION" "$@" + bin/ci-builder run min bin/mzcompose --mz-quiet --find "$BUILDKITE_PLUGIN_MZCOMPOSE_COMPOSITION" "$@" } echo "Collecting logs" @@ -70,7 +70,7 @@ done rm -rf cores echo "Compressing parallel-workload-queries.log" -bin/ci-builder run stable zstd --rm parallel-workload-queries.log || true +bin/ci-builder run min zstd --rm parallel-workload-queries.log || true echo "Uploading log artifacts" 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 # Uploading large files currently sometimes hangs, as a temporary workaround # timeout and don't fail, TODO(def-) Remove timeout again timeout 300 buildkite-agent artifact upload "$artifacts_str" || true -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=$? +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=$? buildkite-agent artifact upload "ci-annotate-errors.log" 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