diff --git a/tools/attack/adv-mixer-3/queue/17-adv-mixer-3-lease-rest.sh b/tools/attack/adv-mixer-3/queue/17-adv-mixer-3-lease-rest.sh index 4f6afd62..69d4b719 100644 --- a/tools/attack/adv-mixer-3/queue/17-adv-mixer-3-lease-rest.sh +++ b/tools/attack/adv-mixer-3/queue/17-adv-mixer-3-lease-rest.sh @@ -8,7 +8,7 @@ T=${THREADS:-48} # the lease hands the command the cores it took: {cores} is the count, so every harness run sizes its threads from it # main's pool rule (19:2x UTC): the release builds and the class v5 suites outrank every sweep; while a waiter labelled # "v5 gate" or "v5 kit" is in the lease queue, no adversarial lease competes: finish the shard in hand, then wait here. -yield_v5() { while /srv/builds/_bin/lease status 2>/dev/null | sed -n '/^waiting/,$p' | grep -qiE "v5 gate|v5 kit"; do sleep 30; done; } +yield_v5() { while /srv/builds/_bin/lease status 2>/dev/null | sed -n '/^waiting/,$p' | grep -qiE "v5|owner=class-v5"; do sleep 30; done; } lease() { yield_v5; /srv/builds/_bin/lease pool "$T" --min 16 --label "adv-mixer-3 $1" --owner adv-mixer-3 -- "${@:2}"; } lease1() { yield_v5; /srv/builds/_bin/lease pool 1 --min 1 --label "adv-mixer-3 $1" --owner adv-mixer-3 -- "${@:2}"; } echo "start $(hostname) $(date -u +%FT%TZ) lease pool up to $T cores, min 16" diff --git a/tools/attack/adv-mixer-3/queue/18-adv-mixer-3-lease-sat.sh b/tools/attack/adv-mixer-3/queue/18-adv-mixer-3-lease-sat.sh index 74ae038a..10cdb33a 100644 --- a/tools/attack/adv-mixer-3/queue/18-adv-mixer-3-lease-sat.sh +++ b/tools/attack/adv-mixer-3/queue/18-adv-mixer-3-lease-sat.sh @@ -8,7 +8,7 @@ T=${THREADS:-48} # the lease hands the command the cores it took: {cores} is the count, so every harness run sizes its threads from it # main's pool rule (19:2x UTC): the release builds and the class v5 suites outrank every sweep; while a waiter labelled # "v5 gate" or "v5 kit" is in the lease queue, no adversarial lease competes: finish the shard in hand, then wait here. -yield_v5() { while /srv/builds/_bin/lease status 2>/dev/null | sed -n '/^waiting/,$p' | grep -qiE "v5 gate|v5 kit"; do sleep 30; done; } +yield_v5() { while /srv/builds/_bin/lease status 2>/dev/null | sed -n '/^waiting/,$p' | grep -qiE "v5|owner=class-v5"; do sleep 30; done; } lease() { yield_v5; /srv/builds/_bin/lease pool "$T" --min 16 --label "adv-mixer-3 $1" --owner adv-mixer-3 -- "${@:2}"; } lease1() { yield_v5; /srv/builds/_bin/lease pool 1 --min 1 --label "adv-mixer-3 $1" --owner adv-mixer-3 -- "${@:2}"; } echo "start $(hostname) $(date -u +%FT%TZ) lease pool up to $T cores, min 16" diff --git a/tools/attack/adv-mixer-3/x-lock.sh b/tools/attack/adv-mixer-3/x-lock.sh index 9d8306e0..c76f0633 100755 --- a/tools/attack/adv-mixer-3/x-lock.sh +++ b/tools/attack/adv-mixer-3/x-lock.sh @@ -7,6 +7,6 @@ B=/srv/builds/_adv-mixer-3/bin/adv-mixer-3; if [ "${1:-}" = v2 ]; then B=$B-v2; LABEL="$1"; shift # main's pool rule (19:2x UTC): the release builds and the class v5 suites outrank every sweep; while a waiter labelled # "v5 gate" or "v5 kit" is in the lease queue, no adversarial lease competes: finish the shard in hand, then wait here. -yield_v5() { while /srv/builds/_bin/lease status 2>/dev/null | sed -n '/^waiting/,$p' | grep -qiE "v5 gate|v5 kit"; do sleep 30; done; } +yield_v5() { while /srv/builds/_bin/lease status 2>/dev/null | sed -n '/^waiting/,$p' | grep -qiE "v5|owner=class-v5"; do sleep 30; done; } yield_v5 exec /srv/builds/_bin/lease pool "${THREADS:-48}" --min 16 --label "adv-mixer-3 $LABEL" --owner adv-mixer-3 -- "$B" "$@"