From 19a5473361ff801129c041d3066f1020a086c903 Mon Sep 17 00:00:00 2001 From: ludamad Date: Thu, 12 Feb 2026 15:02:13 +0000 Subject: [PATCH 1/2] fix(grind-test): pass NAME_POSTFIX Necessary to run compose tests in parallel. --- ci3/grind_test | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci3/grind_test b/ci3/grind_test index ba70d81797f3..1a849bcf8481 100755 --- a/ci3/grind_test +++ b/ci3/grind_test @@ -49,7 +49,8 @@ function grind { # parallel suspends at 2*SIZE and runs 1 job at SIZE, so SIZE = mem * (100 - pct) / 200 local mem=$(total_mem_gb) local memsuspend_gb=$((mem * (100 - memsuspend_pct) / 200)) - awk 'BEGIN {i=1; while (1) print i++}' | timeout $timeout parallel --memsuspend ${memsuspend_gb}G --halt now,fail=10 --joblog "$joblog" -j $jobs --line-buffer "$par_cmd" || true + # NAME_POSTFIX allows for grinding compose tests in parallel. + awk 'BEGIN {i=1; while (1) print i++}' | timeout $timeout parallel --memsuspend ${memsuspend_gb}G --halt now,fail=10 --joblog "$joblog" -j $jobs --line-buffer "NAME_POSTFIX={} $par_cmd" || true # Check if any jobs failed (column 7 is exitval in joblog) if awk 'NR>1 && $7!=0 {found=1} END {exit !found}' "$joblog"; then From 687abdc7cd7aec9cbefe665fd0e5fa69969e4fbf Mon Sep 17 00:00:00 2001 From: ludamad Date: Thu, 12 Feb 2026 15:04:45 +0000 Subject: [PATCH 2/2] Update grind function to use par_cmd variable --- ci3/grind_test | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci3/grind_test b/ci3/grind_test index 1a849bcf8481..67a730f751ba 100755 --- a/ci3/grind_test +++ b/ci3/grind_test @@ -41,7 +41,8 @@ function build { function grind { echo_header "grinding for $timeout" - local par_cmd="CI=0 TRACK_TEST_FAIL=1 run_test_cmd '${hash_prefix}:NAME=test-{} ${test_cmd}'" + # NAME_POSTFIX allows for grinding compose tests in parallel. + local par_cmd="NAME_POSTFIX={} CI=0 TRACK_TEST_FAIL=1 run_test_cmd '${hash_prefix}:NAME=test-{} ${test_cmd}'" local joblog=$(mktemp) # Run for full timeout, logging all results (no --halt, collect all failure data) @@ -49,8 +50,7 @@ function grind { # parallel suspends at 2*SIZE and runs 1 job at SIZE, so SIZE = mem * (100 - pct) / 200 local mem=$(total_mem_gb) local memsuspend_gb=$((mem * (100 - memsuspend_pct) / 200)) - # NAME_POSTFIX allows for grinding compose tests in parallel. - awk 'BEGIN {i=1; while (1) print i++}' | timeout $timeout parallel --memsuspend ${memsuspend_gb}G --halt now,fail=10 --joblog "$joblog" -j $jobs --line-buffer "NAME_POSTFIX={} $par_cmd" || true + awk 'BEGIN {i=1; while (1) print i++}' | timeout $timeout parallel --memsuspend ${memsuspend_gb}G --halt now,fail=10 --joblog "$joblog" -j $jobs --line-buffer "$par_cmd" || true # Check if any jobs failed (column 7 is exitval in joblog) if awk 'NR>1 && $7!=0 {found=1} END {exit !found}' "$joblog"; then