ci: move solana-cargo-build-sbf to nextest (#33257)
This commit is contained in:
parent
0df6749550
commit
d4946ddfaa
|
@ -15,7 +15,7 @@ partitions=$(
|
||||||
"command": ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/stable/run-partition.sh",
|
"command": ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/stable/run-partition.sh",
|
||||||
"timeout_in_minutes": 30,
|
"timeout_in_minutes": 30,
|
||||||
"agent": "$agent",
|
"agent": "$agent",
|
||||||
"parallelism": 3,
|
"parallelism": 2,
|
||||||
"retry": 3
|
"retry": 3
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
|
|
|
@ -20,45 +20,20 @@ INDEX=${1:-"$BUILDKITE_PARALLEL_JOB"} # BUILDKITE_PARALLEL_JOB from 0 to (BUILDK
|
||||||
LIMIT=${2:-"$BUILDKITE_PARALLEL_JOB_COUNT"}
|
LIMIT=${2:-"$BUILDKITE_PARALLEL_JOB_COUNT"}
|
||||||
: "${LIMIT:?}"
|
: "${LIMIT:?}"
|
||||||
|
|
||||||
if [ "$LIMIT" -lt 2 ]; then
|
|
||||||
echo "LIMIT(\$2) should >= 2"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! "$LIMIT" -gt "$INDEX" ]; then
|
if [ ! "$LIMIT" -gt "$INDEX" ]; then
|
||||||
echo "LIMIT(\$2) should greater than INDEX(\$1)"
|
echo "LIMIT(\$2) should greater than INDEX(\$1)"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
DONT_USE_NEXTEST_PACKAGES=(
|
ARGS=(
|
||||||
solana-cargo-build-sbf
|
--profile ci
|
||||||
|
--config-file ./nextest.toml
|
||||||
|
--workspace
|
||||||
|
--tests
|
||||||
|
--jobs "$JOBS"
|
||||||
|
--partition hash:"$((INDEX + 1))/$LIMIT"
|
||||||
|
--verbose
|
||||||
|
--exclude solana-local-cluster
|
||||||
)
|
)
|
||||||
|
|
||||||
if [ "$INDEX" -eq "$((LIMIT - 1))" ]; then
|
_ cargo nextest run "${ARGS[@]}"
|
||||||
ARGS=(
|
|
||||||
--jobs "$JOBS"
|
|
||||||
--tests
|
|
||||||
--verbose
|
|
||||||
)
|
|
||||||
for package in "${DONT_USE_NEXTEST_PACKAGES[@]}"; do
|
|
||||||
ARGS+=(-p "$package")
|
|
||||||
done
|
|
||||||
|
|
||||||
_ cargo test "${ARGS[@]}"
|
|
||||||
else
|
|
||||||
ARGS=(
|
|
||||||
--profile ci
|
|
||||||
--config-file ./nextest.toml
|
|
||||||
--workspace
|
|
||||||
--tests
|
|
||||||
--jobs "$JOBS"
|
|
||||||
--partition hash:"$((INDEX + 1))/$((LIMIT - 1))"
|
|
||||||
--verbose
|
|
||||||
--exclude solana-local-cluster
|
|
||||||
)
|
|
||||||
for package in "${DONT_USE_NEXTEST_PACKAGES[@]}"; do
|
|
||||||
ARGS+=(--exclude "$package")
|
|
||||||
done
|
|
||||||
|
|
||||||
_ cargo nextest run "${ARGS[@]}"
|
|
||||||
fi
|
|
||||||
|
|
|
@ -23,3 +23,7 @@ threads-required = "num-cpus"
|
||||||
[[profile.ci.overrides]]
|
[[profile.ci.overrides]]
|
||||||
filter = "package(solana-gossip) & test(/^cluster_info::tests::new_with_external_ip_test_random/)"
|
filter = "package(solana-gossip) & test(/^cluster_info::tests::new_with_external_ip_test_random/)"
|
||||||
threads-required = "num-cpus"
|
threads-required = "num-cpus"
|
||||||
|
|
||||||
|
[[profile.ci.overrides]]
|
||||||
|
filter = "package(solana-cargo-build-sbf)"
|
||||||
|
threads-required = "num-cpus"
|
||||||
|
|
Loading…
Reference in New Issue